aboutsummaryrefslogtreecommitdiff
path: root/drivers/net
AgeCommit message (Collapse)AuthorFilesLines
2013-08-09Merge branch 'master' of ↵John W. Linville20-70/+96
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
2013-08-09vxlan: fix a soft lockup in vxlan module removalCong Wang1-2/+0
This is a regression introduced by: commit fe5c3561e6f0ac7c9546209f01351113c1b77ec8 Author: stephen hemminger <[email protected]> Date: Sat Jul 13 10:18:18 2013 -0700 vxlan: add necessary locking on device removal The problem is that vxlan_dellink(), which is called with RTNL lock held, tries to flush the workqueue synchronously, but apparently igmp_join and igmp_leave work need to hold RTNL lock too, therefore we have a soft lockup! As suggested by Stephen, probably the flush_workqueue can just be removed and let the normal refcounting work. The workqueue has a reference to device and socket, therefore the cleanups should work correctly. Suggested-by: Stephen Hemminger <[email protected]> Cc: Stephen Hemminger <[email protected]> Cc: David S. Miller <[email protected]> Tested-by: Cong Wang <[email protected]> Signed-off-by: Cong Wang <[email protected]> Acked-by: Stephen Hemminger <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2013-08-09vxlan: fix a regression of igmp joinCong Wang1-1/+1
This is a regression introduced by: commit 3fc2de2faba387218bdf9dbc6b13f513ac3b060a Author: stephen hemminger <[email protected]> Date: Thu Jul 18 08:40:15 2013 -0700 vxlan: fix igmp races Before this commit, the old code was: if (vxlan_group_used(vn, vxlan->default_dst.remote_ip)) ip_mc_join_group(sk, &mreq); else ip_mc_leave_group(sk, &mreq); therefore we shoud check vxlan_group_used(), not its opposite, for igmp_join. Cc: Stephen Hemminger <[email protected]> Cc: David S. Miller <[email protected]> Signed-off-by: Cong Wang <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2013-08-098139cp: Fix skb leak in rx_status_loop failure path.Dave Jones1-0/+1
Introduced in cf3c4c03060b688cbc389ebc5065ebcce5653e96 ("8139cp: Add dma_mapping_error checking") Signed-off-by: Dave Jones <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2013-08-09Hostap: copying wrong data prism2_ioctl_giwaplist()Dan Carpenter1-2/+2
We want the data stored in "addr" and "qual", but the extra ampersands mean we are copying stack data instead. Signed-off-by: Dan Carpenter <[email protected]> Cc: [email protected] Signed-off-by: John W. Linville <[email protected]>
2013-08-09zd1201: do not use stack as URB transfer_bufferJussi Kivilinna1-1/+3
Patch fixes zd1201 not to use stack as URB transfer_buffer. URB buffers need to be DMA-able, which stack is not. Patch is only compile tested. Cc: [email protected] Signed-off-by: Jussi Kivilinna <[email protected]> Signed-off-by: John W. Linville <[email protected]>
2013-08-09Merge branch 'for-john' of ↵John W. Linville5-26/+32
git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes
2013-08-09iwlwifi: pcie: Remove duplicate code from pcie irq handlersIdo Yariv1-16/+8
Instead of having the same code sequentially, fall-through. Signed-off-by: Ido Yariv <[email protected]> Signed-off-by: Johannes Berg <[email protected]>
2013-08-09iwlwifi: pcie: Refactor iwl_rxq_spaceIdo Yariv1-9/+10
Simplify iwl_rxq_space to improve readability and reduce the ambiguity spares to a single element. Signed-off-by: Ido Yariv <[email protected]> Signed-off-by: Johannes Berg <[email protected]>
2013-08-09iwlwifi: pcie: Refactor iwl_queue_spaceIdo Yariv1-12/+24
Reduce the ambiguity spares to a single element if the window size is not smaller than the queue size. If smaller, no spares are required at all. Signed-off-by: Ido Yariv <[email protected]> Signed-off-by: Johannes Berg <[email protected]>
2013-08-09iwlwifi: introduce external debug levelMatti Gottlieb1-0/+2
This debug level will be used in the future for logging interaction with external modules. Signed-off-by: Matti Gottlieb <[email protected]> Signed-off-by: Johannes Berg <[email protected]>
2013-08-09iwlwifi: mvm: Fix beacon filtering enablement via debugfsAlexander Bondar1-4/+1
The code was only enabling it when already enabled, which obviously can't work. Signed-off-by: Alexander Bondar <[email protected]> Signed-off-by: Johannes Berg <[email protected]>
2013-08-08bonding: unwind on bond_add_vlan failure[email protected]1-2/+2
In case of bond_add_vlan() failure currently we'll have the vlan's refcnt bumped up in all slaves, but it will never go down because it failed to get added to the bond, so properly unwind the added vlan if bond_add_vlan fails. Signed-off-by: Nikolay Aleksandrov <[email protected]> Acked-by: Veaceslav Falico <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2013-08-08bonding: change the bond's vlan syncing functions with the standard ones[email protected]1-30/+7
Now we have vlan_vids_add/del_by_dev() which serve the same purpose as bond's bond_add/del_vlans_on_slave() with the good side effect of reverting the changes if one of the additions fails. There's only 1 change in the behaviour of enslave: if adding of the vlans to the slave fails, we'll fail the enslaving because otherwise we might delete some vlan that wasn't added by the bonding. The only way this may happen is with ENOMEM currently, so we're in trouble anyway. Signed-off-by: Nikolay Aleksandrov <[email protected]> Acked-by: Veaceslav Falico <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2013-08-08Merge branch 'master' of ↵John W. Linville3-13/+11
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
2013-08-07net: phy: mdio: add missing __iomem annotationJingoo Han1-1/+1
Added missing __iomem annotation in order to fix the following sparse warnings: drivers/net/phy/mdio-mux-mmioreg.c:51:27: warning: incorrect type in initializer (different address spaces) drivers/net/phy/mdio-mux-mmioreg.c:51:27: expected void *p drivers/net/phy/mdio-mux-mmioreg.c:51:27: got void [noderef] <asn:2>* drivers/net/phy/mdio-mux-mmioreg.c:57:21: warning: incorrect type in argument 1 (different address spaces) drivers/net/phy/mdio-mux-mmioreg.c:57:21: expected void const volatile [noderef] <asn:2>*addr drivers/net/phy/mdio-mux-mmioreg.c:57:21: got void *p drivers/net/phy/mdio-mux-mmioreg.c:60:25: warning: incorrect type in argument 2 (different address spaces) drivers/net/phy/mdio-mux-mmioreg.c:60:25: expected void volatile [noderef] <asn:2>*addr drivers/net/phy/mdio-mux-mmioreg.c:60:25: got void *p drivers/net/phy/mdio-mux-mmioreg.c:64:25: warning: incorrect type in argument 1 (different address spaces) drivers/net/phy/mdio-mux-mmioreg.c:64:25: expected void volatile [noderef] <asn:2>*addr drivers/net/phy/mdio-mux-mmioreg.c:64:25: got void *p Signed-off-by: Jingoo Han <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2013-08-07net: phy: micrel: Staticize ksz8873mll_read_status()Jingoo Han1-1/+1
ksz8873mll_read_status() is used only in this file. Fix the following sparse warning: drivers/net/phy/micrel.c:147:5: warning: symbol 'ksz8873mll_read_status' was not declared. Should it be static? Signed-off-by: Jingoo Han <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2013-08-07net: move zerocopy_sg_from_iovec() to net/core/datagram.cJason Wang2-160/+0
To let it be reused and reduce code duplication. Also document this function. Signed-off-by: Jason Wang <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2013-08-07net: move iov_pages() to net/core/iovec.cJason Wang2-46/+0
To let it be reused and reduce code duplication. Signed-off-by: Jason Wang <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2013-08-07bnx2: Update version to 2.2.4Michael Chan2-4/+4
and update copyright year. Signed-off-by: Michael Chan <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2013-08-07bnx2: Add pci shutdown handler.Michael Chan1-22/+25
WoL and power state changes will now be done in the shutdown handler. open/close/ethtool will no longer change the power state. NVRAM operations can now be permitted whether the device is up or down. Signed-off-by: Michael Chan <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2013-08-07bnx2: Use SIMPLE_DEV_PM_OPS.Michael Chan1-20/+25
This simplifies the suspend/resume code. Signed-off-by: Michael Chan <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2013-08-07bnx2: Refactor WoL setup into a separate function.Michael Chan1-80/+81
Separate MAC and PHY WoL setup code into a separate function. Signed-off-by: Michael Chan <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2013-08-07bnx2: Use kernel APIs for WoL and power state changes.Michael Chan1-22/+14
Simple API changes with no functional changes. Signed-off-by: Michael Chan <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2013-08-07bnx2: Handle error condition in ->slot_reset()Michael Chan1-5/+10
by closing the device if necessary. Otherwise, since NAPI state is already disabled, a subsequent close will hang the system. Signed-off-by: Michael Chan <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2013-08-07be2net: update driver versionSathya Perla1-1/+1
Signed-off-by: Sathya Perla <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2013-08-07be2net: Initialize "status" in be_cmd_get_die_temperature()Vasundhara Volam1-1/+1
Uninitialized value was being returned in the non-failure case. Signed-off-by: Vasundhara Volam <[email protected]> Signed-off-by: Sathya Perla <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2013-08-07be2net: fixup log msgs for async eventsVasundhara Volam1-2/+4
Log the event type for unknown async events Signed-off-by: Vasundhara Volam <[email protected]> Signed-off-by: Sathya Perla <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2013-08-07be2net: Fix displaying supported speeds for BE2Vasundhara Volam1-0/+6
The BE2 FW GET_PHY_DETAILS cmd does not return fixed speeds supported. Signed-off-by: Vasundhara Volam <[email protected]> Signed-off-by: Sathya Perla <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2013-08-07be2net: don't limit max MAC and VLAN countsVasundhara Volam1-7/+0
For SH-R and Lancer-R, use the FW supported values for Max unicast MACs, Max VLANs and Max multicast MACs. Signed-off-by: Vasundhara Volam <[email protected]> Signed-off-by: Sathya Perla <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2013-08-07be2net: Do not call get_die_temperature cmd for VFVasundhara Volam1-1/+2
This is a chip wide value and the PFs already report it. Signed-off-by: Vasundhara Volam <[email protected]> Signed-off-by: Sathya Perla <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2013-08-07be2net: Adding more speeds reported by get_settingsVasundhara Volam2-1/+10
The new speeds are supported by variants of the Skyhawk-R chip. Signed-off-by: Vasundhara Volam <[email protected]> Signed-off-by: Sathya Perla <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2013-08-07ath6kl: Fix invalid pointer access on fuzz testing with AP modeMohammed Shafi Shajakhan1-0/+3
In our Fuz testing, reference client corrupts the dest mac to "00:00:00:00:00:00" in the WPA2 handshake no 2. During driver init the sta_list entries mac addresses are by default "00:00:00:00:00:00". Driver returns an invalid pointer (conn) and the drver shall crash, if rxtids (aggr_conn) skb queues are accessed, since they would not be initialized. Signed-off-by: Mohammed Shafi Shajakhan <[email protected]> Signed-off-by: Kalle Valo <[email protected]>
2013-08-07ath6kl: Fix race in heart beat pollingVasanthakumar Thiagarajan1-0/+3
Make sure to cancel heart beat timer before freeing wmi to avoid potential NULL pointer dereference. Signed-off-by: Vasanthakumar Thiagarajan <[email protected]> Signed-off-by: Mohammed Shafi Shajakhan <[email protected]> Signed-off-by: Kalle Valo <[email protected]>
2013-08-07ath10k: add SoC power save option to PCI features mapBartosz Markowski2-12/+21
Unify the PCI options location. By default the SoC PS option is disabled to boost the performance and due to poor stability on early HW revisions. In future we can remove the module parameter and turn on/off the PS for given hardware. This change also makes the pci module parameter for SoC PS static. Signed-off-by: Bartosz Markowski <[email protected]> Signed-off-by: Kalle Valo <[email protected]>
2013-08-06wireless: make TU conversion macros availableJohannes Berg1-5/+2
A few places in the code (mac80211 and iwlmvm) use the same TU_TO_JIFFIES() macro and could use TU_TO_EXP_TIME() that mac80211 has. Make these available to everyone and use them. Signed-off-by: Johannes Berg <[email protected]>
2013-08-06iwlwifi: mvm: disconnect if time event scheduling failsJohannes Berg1-10/+23
If scheduling an important time event fails, or if we get an unexpected notification from the firmware, there isn't much we can do to recover, so just drop the connection and let higher layers retry it. Reviewed-by: Ilan Peer <[email protected]> Signed-off-by: Johannes Berg <[email protected]>
2013-08-06iwlwifi: mvm: use designated initialization for some arraysEliad Peller1-15/+21
rs_ht_to_legacy and ant_toggle_lookup are arrays that represent some state-machine. initialize them explicitly with designated initialization to make them more clear and avoid errors. Signed-off-by: Eliad Peller <[email protected]> Reviewed-by: Emmanuel Grumbach <[email protected]> Signed-off-by: Johannes Berg <[email protected]>
2013-08-06iwlwifi: mvm: add some missing cleanups in iwl_mvm_mac_add_interfaceEliad Peller1-5/+10
iwl_mvm_mac_add_interface() didn't clean up beacon filtering configuration and ctxt allocation in some error cases. Signed-off-by: Eliad Peller <[email protected]> Reviewed-by: Alexander Bondar <[email protected]> Signed-off-by: Johannes Berg <[email protected]>
2013-08-06iwlwifi: remove transport suspend/resume indirectionJohannes Berg3-50/+13
There's no reason for the transport to call itself through indirect function pointers, inline the (little) code there is and remove the indirection completely. Reviewed-by: Gregory Greenman <[email protected]> Signed-off-by: Johannes Berg <[email protected]>
2013-08-06iwlwifi: pcie: some little cleanupsEliad Peller1-7/+4
do some little cleanups in tx.c - eliminate duplicate checks, use locally cached fields and predefined macros. Signed-off-by: Eliad Peller <[email protected]> Signed-off-by: Johannes Berg <[email protected]>
2013-08-06iwlwifi: fix some documentation typosEliad Peller5-10/+10
Fix some typos. Signed-off-by: Eliad Peller <[email protected]> Signed-off-by: Johannes Berg <[email protected]>
2013-08-06iwlwifi: mvm: small cleanups in quota management codeJohannes Berg1-6/+5
Use a C99 initializer to clear the command and move the lockdep assertion before the restart check. Since this causes problems with the BUILD_BUG_ON() with some compilers, change that a bit. Signed-off-by: Johannes Berg <[email protected]>
2013-08-06iwlwifi: mvm: fix signal reporting for < 3 antennasAvri Altman1-6/+12
When fewer than three antennas are connected (as is always the case for the current devices), the signal strength reporting was wrong; fix it. Signed-off-by: Avri Altman <[email protected]> Signed-off-by: Johannes Berg <[email protected]>
2013-08-06iwlwifi: mvm: remove traffic load monitoring in rsEyal Shapira2-123/+17
The traffic load monitoring isn't used anymore to decide whether a Tx aggregation on a specific TID should be started. No point in collecting these statistics. Remove the relevant code. Signed-off-by: Eyal Shapira <[email protected]> Reviewed-by: Emmanuel Grumbach <[email protected]> Signed-off-by: Johannes Berg <[email protected]>
2013-08-06iwlwifi: pcie: fix resume when no opmode is presentJohannes Berg1-0/+3
If no opmode is present during suspend/resume (i.e. if the iwldvm or iwlmvm isn't loaded) the driver crashes during resume, trying to call the rfkill notification. Avoid that, and also don't enable the rfkill interrupt in this case (to avoid crashing trying to handle the interrupt later.) Reviewed-by: Emmanuel Grumbach <[email protected]> Signed-off-by: Johannes Berg <[email protected]>
2013-08-06iwlwifi: mvm: Add RX statistics debugfs entryMatti Gottlieb4-0/+155
Add a debugfs entry for the RX statistics received from the firmware. Signed-off-by: Matti Gottlieb <[email protected]> Reviewed-by: Emmanuel Grumbach <[email protected]> Signed-off-by: Johannes Berg <[email protected]>
2013-08-06Revert "iwlwifi: pcie: clear RFKILL interrupt in AMPG"Guy Cohen2-10/+0
This reverts commit a53ee0a308b16e392e0219c585b10f329345766b. This fix causes a worse HW Error when entering RF-Kill. Signed-off-by: Guy Cohen <[email protected]> Signed-off-by: Dor Shaish <[email protected]> Reviewed-by: Emmanuel Grumbach <[email protected]> Signed-off-by: Johannes Berg <[email protected]>
2013-08-05bonding: modify only neigh_parms owned by usVeaceslav Falico1-1/+7
Otherwise, on neighbour creation, bond_neigh_init() will be called with a foreign netdev. Signed-off-by: Veaceslav Falico <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2013-08-05gianfar: Cleanup TxFCB insertion on xmitClaudiu Manoil1-29/+33
Cleanup gfar_start_xmit()'s fast path by factoring out "redundant" FCB insertion code (repeated gfar_add_fcb() calls and related) and by reducing the number of if() clauses (i.e. if(fcb) checks). Improve maintainability (e.g. there's less code and easier to read) also by introducing do_csum and do_vlan to mark the other 2 Tx TOE functionalities, following the same model as do_tstamp. fcb_len may also be 0 now, to mark that Tx FCB insertion conditions (do_csum, do_vlan, do_tstamp) have not been met. Signed-off-by: Claudiu Manoil <[email protected]> Signed-off-by: David S. Miller <[email protected]>
Powered by cgit, Gruvboxed by Blaster4385.