path: root/drivers/net/wireless
AgeCommit message (Collapse)AuthorFilesLines
2014-09-23brcmfmac: Fix off by one bug in brcmf_count_20mhz_channels()Emil Goode1-1/+1
In the brcmf_count_20mhz_channels function we are looping through a list of channels received from firmware. Since the index of the first channel is 0 the condition leads to an off by one bug. This is causing us to hit the WARN_ON_ONCE(1) calls in the brcmu_d11n_decchspec function, which is how I discovered the bug. Introduced by: commit b48d891676f756d48b4d0ee131e4a7a5d43ca417 ("brcmfmac: rework wiphy structure setup") Acked-by: Arend van Spriel <> Signed-off-by: Emil Goode <> Signed-off-by: John W. Linville <>
2014-09-22ath9k: Fix NULL pointer dereference on early irqWojciech Dubowik1-1/+1
The ah struct might not have been initialized when interrupt comes so check for it. Signed-off-by: Wojciech Dubowik <> Signed-off-by: John W. Linville <>
2014-09-15ath9k_htc: fix random decryption failureJohannes Stezenbach1-1/+1
In v3.15 the driver stopped to accept network packets after successful authentification, which could be worked around by passing the nohwcrypt=1 module parameter. This was not reproducible by everyone, and showed random behaviour in some tests. It was caused by an uninitialized variable introduced in 4ed1a8d4a257 ("ath9k_htc: use ath9k_cmn_rx_accept") and used in 341b29b9cd2f ("ath9k_htc: use ath9k_cmn_rx_skb_postprocess"). Bugzilla: Fixes: 341b29b9cd2f ("ath9k_htc: use ath9k_cmn_rx_skb_postprocess") Signed-off-by: Johannes Stezenbach <> Signed-off-by: John W. Linville <>
2014-09-15brcmfmac: handle IF event for P2P_DEVICE interfaceArend van Spriel2-3/+11
The firmware notifies about interface changes through the IF event which has a NO_IF flag that means host can ignore the event. This behaviour was introduced in the driver by: commit 2ee8382fc6c763c76396a6aaff77a27089eed3aa Author: Arend van Spriel <> Date: Sat Aug 10 12:27:24 2013 +0200 brcmfmac: ignore IF event if firmware indicates it It turns out that the IF event for the P2P_DEVICE also has this flag set, but the event should not be ignored in this scenario. The mentioned commit caused a regression in 3.12 kernel in creation of the P2P_DEVICE interface. Cc: <> # 3.14, 3.16 Reviewed-by: Hante Meuleman <> Reviewed-by: Franky (Zhenhui) Lin <> Reviewed-by: Daniel (Deognyoun) Kim <> Reviewed-by: Pieter-Paul Giesberts <> Signed-off-by: Arend van Spriel <> Signed-off-by: John W. Linville <>
2014-09-15brcmfmac: obtain ifp through wdev structureArend van Spriel1-2/+5
For P2P_DEVICE interface the function brcmf_cfg80211_update_proto_addr_mode() resulted in a crash, because it assumed wdev->netdev would be valid. The ifp should be obtained through the driver vif structure which contains the wireless_dev. Reviewed-by: Hante Meuleman <> Reviewed-by: Franky (Zhenhui) Lin <> Reviewed-by: Daniel (Deognyoun) Kim <> Reviewed-by: Pieter-Paul Giesberts <> Signed-off-by: Arend van Spriel <> Signed-off-by: John W. Linville <>
2014-09-15brcmfmac: conditionally compile firmware protocol source codeArend van Spriel4-8/+30
The host-interface can select which protocol implementation it needs. Selecting PCIe will include the msgbuf protocol and selecting USB and/or SDIO will include the bcdc protocol. The PCIe kconfig option assures the dependencies for msgbuf are met, ie. HAS_DMA. Reported-by: Geert Uytterhoeven <> Reviewed-by: Franky (Zhenhui) Lin <> Reviewed-by: Hante Meuleman <> Reviewed-by: Daniel (Deognyoun) Kim <> Reviewed-by: Pieter-Paul Giesberts <> Signed-off-by: Arend van Spriel <> Signed-off-by: John W. Linville <>
2014-09-15brcmfmac: Fix memory leak and missing assignment.Hante Meuleman1-0/+2
The function brcmf_enable_bw40_2g contains a memory leak. The function is also missing initialisation of one of the members of ch struct, which can lead to warning but this has no impact on result. Reviewed-by: Arend Van Spriel <> Reviewed-by: Franky (Zhenhui) Lin <> Reviewed-by: Pieter-Paul Giesberts <> Reviewed-by: Daniel (Deognyoun) Kim <> Signed-off-by: Hante Meuleman <> Signed-off-by: Arend van Spriel <> Signed-off-by: John W. Linville <>
2014-09-11Revert "ath9k: Calculate sleep duration"Sujith Manoharan1-3/+2
This reverts commit 09ebb810927a110e4c354beb20308830d108a54b. ath9k_hw_set_sta_beacon_timers() configures AR_TIM_PERIOD with the beacon interval. Before this commit, the sleepduration was never greater than the beacon interval. But now, the behavior has changed. For example, with an AP that uses a beacon interval of 100: ath: phy9: next beacon 61128704 ath: phy9: beacon period 204800 ath: phy9: DTIM period 204800 If the sleepduration is calculated based on the listen time, then the bmiss threshold should also be changed since the HW would be in sleep state for a longer time, but that is not done currently. To avoid configuring a higher beacon interval based on the sleepduration, revert to the original behavior. Power consumption is not a problem since PS is disabled in ath9k anyway. Cc: Cc: Rajkumar Manoharan <> Signed-off-by: Sujith Manoharan <> Signed-off-by: John W. Linville <>
2014-09-09Merge branch 'for-john' of ↵John W. Linville14-39/+65
2014-09-08iwlwifi: mvm: fix an overflow in iwl_mvm_get_signal_strengthEyal Shapira1-3/+3
The idea here is to translate a value of 0 received from the firmware to the lowest rssi figure. As rx_status->chain_signal is a signed byte the lowest possible value is -128 and not -256. -256 was causing 0 to get stored in the signed byte. Signed-off-by: Eyal Shapira <> Reviewed-by: Johannes Berg <> Signed-off-by: Emmanuel Grumbach <>
2014-09-08iwlwifi: add PCI IDs and add then new 3165 seriesOren Givon3-0/+24
This change does the following: 1) Add a new 7265 series PCI ID 2) Add two new 3160 series PCI IDs 3) Add the new 3165 series PCI IDs and configurations Signed-off-by: Oren Givon <> Signed-off-by: Emmanuel Grumbach <>
2014-09-08iwlwifi: dvm: disable power save by defaultEmmanuel Grumbach1-1/+1
In, the submitter said that disabling power saving helped, do just that. Signed-off-by: Emmanuel Grumbach <>
2014-09-08iwlwifi: mvm: BT Coex - always initialize smps_modeJohannes Berg1-4/+3
smps_mode is used uninitialized in a debug statement in AP mode, so always initialize it. While at it, fix a typo. Signed-off-by: Johannes Berg <> Reviewed-by: Luciano Coelho <> Signed-off-by: Emmanuel Grumbach <>
2014-09-08iwlwiwi: mvm: use bss_conf->dtim_period instead of conf.ps_dtim_periodEmmanuel Grumbach2-5/+3
The latter is meant for software implementation of power save and is not per-virtual interface. Since our driver supports multiple virtual interfaces, we need to use vif->bss_conf.dtim_period. Signed-off-by: Emmanuel Grumbach <>
2014-09-08iwlwifi: mvm: treat EAPOLs like mgmt frames wrt rateEyal Shapira1-2/+6
Using the LQ table which is initially set according to the rssi could lead to EAPOLs being sent in high legacy rates like 54mbps. It's better to avoid sending EAPOLs in high rates as it reduces the chances of a successful 4-Way handshake. Avoid this and treat them like other mgmt frames which would initially get sent at the basic rate. Cc: <> [3.13+] Signed-off-by: Eyal Shapira <> Reviewed-by: Johannes Berg <> Signed-off-by: Emmanuel Grumbach <>
2014-09-08iwlwifi: mvm: correctly handle PM/QoS changes from mac80211Johannes Berg1-5/+6
When mac80211 requests multiple BSS config changes, as for example while associating, we ignore power management and QoS changes and only apply them later. Fix that by removing the "else" and making the conditions independent. Also move it after (potential) beacon filter enablement to have that already enabled when going into power management code. Signed-off-by: Johannes Berg <> Signed-off-by: Emmanuel Grumbach <>
2014-09-08iwlwifi: increase DEFAULT_MAX_TX_POWEREliad Peller2-3/+3
The chip is able to transmit up to 22dBm, so set the constant appropriately. CC: <> [3.13+] Signed-off-by: Eliad Peller <> Signed-off-by: Emmanuel Grumbach <>
2014-09-08iwlwifi: mvm: fix endianity issues with Smart Fifo commandsEmmanuel Grumbach2-3/+3
This code was broken on big endian systems. Sparse didn't catch the bug since the firmware command was not tagged as little endian. Fix the bug for big endian systems and tag the field in the firmware command to prevent such issues in the future. Cc: [3.14+] Fixes: 1f3b0ff8ec ("iwlwifi: mvm: Add Smart FIFO support") Reviewed-by: Johannes Berg <> Signed-off-by: Emmanuel Grumbach <>
2014-09-08iwlwifi: mvm: set MAC_FILTER_IN_BEACON correctly for STA/P2P clientLuciano Coelho1-5/+5
In commit cad3f08c (iwlwifi: mvm: enable MAC_FILTER_IN_BEACON when forced_assoc_off is set) the code to set the MAC_FILTER_IN_BEACON flag was accidentally moved to the main block of the if statement, while it should be in the else block instead. Move it to the right place. Fixes: cad3f08c23de ("iwlwifi: mvm: enable MAC_FILTER_IN_BEACON when forced_assoc_off is set") Reviewed-by: Johannes Berg <> Signed-off-by: Luciano Coelho <> Signed-off-by: Emmanuel Grumbach <>
2014-09-08iwlwifi: mvm: BT Coex - remove shadowing variableJohannes Berg1-2/+0
The variable 'u32 mode' exists twice, the latter shadowing the former - remove the latter since there's no need for two variables. Signed-off-by: Johannes Berg <> Signed-off-by: Emmanuel Grumbach <>
2014-09-04Merge branch 'for-john' of ↵John W. Linville4-5/+15
2014-09-01iwlwifi: mvm: enable scheduled scan on newest firmwareEmmanuel Grumbach1-6/+8
Scheduled scan was disabled because of a bug in the firmware. The firmware reported support for this feature, but enabling it led to assertions. The bugs have been fixes in latest firmware versions, so that we can re-enable the feature on latest firmwares only. Signed-off-by: Emmanuel Grumbach <>
2014-09-01iwlwifi: bump firmware API version to 10 for 7000 and 8000Emmanuel Grumbach2-3/+3
New firmware on the way. Signed-off-by: Emmanuel Grumbach <>
2014-08-31iwlwifi: Remove module build requirement for Intel Wireless WiFiMarcel Holtmann1-2/+0
The CONFIG_IWLDVM and CONFIG_IWLMVM currently have a "depends on m" as its requirement forcing it to be build as module. This is not needed and thus just remove it. Fixes: ae7486a2b734 ("iwlwifi: fix Kconfig issues") Signed-off-by: Marcel Holtmann <> [Squashed 2 commites for MVM and DVM] Signed-off-by: Emmanuel Grumbach <>
2014-08-31Revert "iwlwifi: dvm: don't enable CTS to self"Emmanuel Grumbach1-0/+12
This reverts commit 43d826ca5979927131685cc2092c7ce862cb91cd. This commit caused packet loss. Cc: <> Signed-off-by: Emmanuel Grumbach <>
2014-08-25rtlwifi: rtl8192cu: Add new IDLarry Finger1-0/+1
The Sitecom WLA-2102 adapter uses this driver. Reported-by: Nico Baggus <> Signed-off-by: Larry Finger <> Cc: Nico Baggus <> Cc: Stable <> Signed-off-by: John W. Linville <>
2014-08-25ath9k: fix wrong string size for strncmp in write_file_spec_scan_ctl()Maks Naumov1-1/+1
Signed-off-by: Maks Naumov <> Signed-off-by: John W. Linville <>
2014-08-25at76c50x-usb: fix use after free on failure path in at76_probe()Alexey Khoroshilov1-2/+1
After commit 174beab7d445 ("at76c50x-usb: Don't perform DMA from stack memory") at76_delete_device() and usb_put_dev() are called both if at76_init_new_device() fails in at76_probe(). But at76_delete_device() does usb_put_dev(priv->dev) itself that means double usb_put_dev(). The patch avoids the problem by moving usb_put_dev() from at76_delete_device() to at76_disconnect(). Found by Linux Driver Verification project ( Signed-off-by: Alexey Khoroshilov <> Signed-off-by: John W. Linville <>
2014-08-25rtlwifi: btcoexist: adjust double testHimangi Saraogi1-1/+1
Rewrite a duplicated test to test the correct value The Coccinelle semantic patch that finds this problem is: // <smpl> @@ expression E; @@ ( * E || ... || E | * E && ... && E ) // </smpl> Signed-off-by: Himangi Saraogi <> Acked-by: Larry.Finger <> Signed-off-by: John W. Linville <>
2014-08-14Merge tag 'pci-v3.17-changes-2' of ↵Linus Torvalds30-30/+30
git:// Pull DEFINE_PCI_DEVICE_TABLE removal from Bjorn Helgaas: "Part two of the PCI changes for v3.17: - Remove DEFINE_PCI_DEVICE_TABLE macro use (Benoit Taine) It's a mechanical change that removes uses of the DEFINE_PCI_DEVICE_TABLE macro. I waited until later in the merge window to reduce conflicts, but it's possible you'll still see a few" * tag 'pci-v3.17-changes-2' of git:// PCI: Remove DEFINE_PCI_DEVICE_TABLE macro use
2014-08-14Merge tag 'master-2014-08-14' of ↵David S. Miller6-6/+37
git:// John W. Linville says: ==================== pull request: wireless 2014-08-14 Please pull this batch of fixes intended for the 3.17 stream... Arend van Spriel brings two brcmfmac fixes, one which fixes a memory leak and one which corrects some merge damage. Emmanuel Grumbach fixes Linus's iwlwifi firmware-related log spam. Rickard Strandqvist does some proper NULL termination after a call to strncpy. Ronald Wahl corrects a carl9170 problem with sending URBs with the wrong endpoint type (resulting in log spam). ==================== Signed-off-by: David S. Miller <>
2014-08-14iwlwifi: mvm: disable scheduled scan to prevent firmware crashEmmanuel Grumbach1-1/+2
There are firmwares which don't support scheduled scan. Disable it for now. Linus's system encoutered this issue. Thanks to David Spinadel for his help. Tested-by: Linus Torvalds <> Signed-off-by: Emmanuel Grumbach <>
2014-08-13Merge git:// Torvalds2-16/+17
Pull networking fixes from David Miller: "Several networking final fixes and tidies for the merge window: 1) Changes during the merge window unintentionally took away the ability to build bluetooth modular, fix from Geert Uytterhoeven. 2) Several phy_node reference count bug fixes from Uwe Kleine-König. 3) Fix ucc_geth build failures, also from Uwe Kleine-König. 4) Fix klog false positivies when netlink messages go to network taps, by properly resetting the network header. Fix from Daniel Borkmann. 5) Sizing estimate of VF netlink messages is too small, from Jiri Benc. 6) New APM X-Gene SoC ethernet driver, from Iyappan Subramanian. 7) VLAN untagging is erroneously dependent upon whether the VLAN module is loaded or not, but there are generic dependencies that matter wrt what can be expected as the SKB enters the stack. Make the basic untagging generic code, and do it unconditionally. From Vlad Yasevich. 8) xen-netfront only has so many slots in it's transmit queue so linearize packets that have too many frags. From Zoltan Kiss. 9) Fix suspend/resume PHY handling in bcmgenet driver, from Florian Fainelli" * git:// (55 commits) net: bcmgenet: correctly resume adapter from Wake-on-LAN net: bcmgenet: update UMAC_CMD only when link is detected net: bcmgenet: correctly suspend and resume PHY device net: bcmgenet: request and enable main clock earlier net: ethernet: myricom: myri10ge: myri10ge.c: Cleaning up missing null-terminate after strncpy call xen-netfront: Fix handling packets on compound pages with skb_linearize net: fec: Support phys probed from devicetree and fixed-link smsc: replace WARN_ON() with WARN_ON_SMP() xen-netback: Don't deschedule NAPI when carrier off net: ethernet: qlogic: qlcnic: Remove duplicate object file from Makefile wan: wanxl: Remove typedefs from struct names m68k/atari: EtherNEC - ethernet support (ne) net: ethernet: ti: cpmac.c: Cleaning up missing null-terminate after strncpy call hdlc: Remove typedefs from struct names airo_cs: Remove typedef local_info_t atmel: Remove typedef atmel_priv_ioctl com20020_cs: Remove typedef com20020_dev_t ethernet: amd: Remove typedef local_info_t net: Always untag vlan-tagged traffic on input. drivers: net: Add APM X-Gene SoC ethernet driver support. ...
2014-08-12PCI: Remove DEFINE_PCI_DEVICE_TABLE macro useBenoit Taine30-30/+30
We should prefer `struct pci_device_id` over `DEFINE_PCI_DEVICE_TABLE` to meet kernel coding style guidelines. This issue was reported by checkpatch. A simplified version of the semantic patch that makes this change is as follows ( // <smpl> @@ identifier i; declarer name DEFINE_PCI_DEVICE_TABLE; initializer z; @@ - DEFINE_PCI_DEVICE_TABLE(i) + const struct pci_device_id i[] = z; // </smpl> [bhelgaas: add semantic patch] Signed-off-by: Benoit Taine <> Signed-off-by: Bjorn Helgaas <>
2014-08-11airo_cs: Remove typedef local_info_tHimangi Saraogi1-12/+13
The Linux kernel coding style guidelines suggest not using typedefs for structure types. This patch gets rid of the typedef for local_info_t. Also, the name of the struct is changed to drop the _t, to make the name look less typedef-like. The following Coccinelle semantic patch detects the case: @tn@ identifier i; type td; @@ -typedef struct i { ... } -td ; @@ type; identifier tn.i; @@ -td + struct i Signed-off-by: Himangi Saraogi <> Acked-by: Julia Lawall <> Signed-off-by: David S. Miller <>
2014-08-11atmel: Remove typedef atmel_priv_ioctlHimangi Saraogi1-4/+4
The Linux kernel coding style guidelines suggest not using typedefs for structure types. This patch gets rid of the typedef for atmel_priv_ioctl. The following Coccinelle semantic patch detects the case: @tn@ identifier i; type td; @@ -typedef struct i { ... } -td ; @@ type; identifier tn.i; @@ -td + struct i Signed-off-by: Himangi Saraogi <> Acked-by: Julia Lawall <> Signed-off-by: David S. Miller <>
2014-08-11net: wireless: ipw2x00: ipw2200.c: Cleaning up missing null-terminate after ↵Rickard Strandqvist1-0/+1
strncpy call Added a guaranteed null-terminate after call to strncpy. Signed-off-by: Rickard Strandqvist <> Signed-off-by: John W. Linville <>
2014-08-11brcmfmac: fix memory leakage in msgbufArend van Spriel1-0/+4
The kbuild robot came up with the following warning: tree: .../kernel/git/linville/wireless-next.git master head: dc6be9f54a4ecb0a09765d1f515ed947d86b7528 commit: 9a1bb60250d2b6b546a62e5b73f55c4f1d22016b [5/13] brcmfmac: Adding msgbuf protocol. coccinelle warnings: drivers/net/wireless/brcm80211/brcmfmac/msgbuf.c:1309:1-28: alloc with no test, possible model on line 1318 Looking into the issue, it turned out that the referred allocation buffer was not being released in failure path nor upon module unload. Reported-by: Fengguang Wu <> Reviewed-by: Franky (Zhenhui) Lin <> Reviewed-by: Daniel (Deognyoun) Kim <> Reviewed-by: Pieter-Paul Giesberts <> Signed-off-by: Arend van Spriel <> Signed-off-by: John W. Linville <>
2014-08-11brcmfmac: fix curly brace mistake in brcmf_pcie_handle_mb_data()Arend van Spriel1-1/+2
Running coccicheck on brcm80211 drivers resulted in following report: $ make coccicheck MODE=report M=drivers/net/wireless/brcm80211 drivers/net/wireless/brcm80211/brcmfmac/pcie.c:595:2-43: code aligned with following code on line 596 It revealed that due to a merge failure a block statement lost its curly braces where it should not. Signed-off-by: Arend van Spriel <> Signed-off-by: John W. Linville <>
2014-08-11carl9170: fix sending URBs with wrong type when using full-speedRonald Wahl2-4/+28
The driver assumes that endpoint 4 is always an interrupt endpoint. Unfortunately the type differs between high-speed and full-speed configurations while in the former case it is indeed an interrupt endpoint this is not true for the latter case - here it is a bulk endpoint. When sending URBs with the wrong type the kernel will generate a warning message including backtrace. In this specific case there will be a huge amount of warnings which can bring the system to freeze. To fix this we are now sending URBs to endpoint 4 using the type found in the endpoint descriptor. A side note: The carl9170 firmware currently specifies endpoint 4 as interrupt endpoint even in the full-speed configuration but this has no relevance because before this firmware is loaded the endpoint type is as described above and after the firmware is running the stick is not reenumerated and so the old descriptor is used. Signed-off-by: Ronald Wahl <> Cc: <> Signed-off-by: John W. Linville <>
2014-08-08rtlwifi: use pci_zalloc_consistentJoe Perches1-12/+5
Remove the now unnecessary memset too. Signed-off-by: Joe Perches <> Cc: Larry Finger <> Cc: Chaoming Li <> Cc: "John W. Linville" <> Signed-off-by: Andrew Morton <> Signed-off-by: Linus Torvalds <>
2014-08-08rtl818x: use pci_zalloc_consistentJoe Perches1-7/+4
Remove the now unnecessary memset too. Signed-off-by: Joe Perches <> Cc: "John W. Linville" <> Signed-off-by: Andrew Morton <> Signed-off-by: Linus Torvalds <>
2014-08-08mwl8k: use pci_zalloc_consistentJoe Perches1-4/+2
Remove the now unnecessary memset too. Signed-off-by: Joe Perches <> Cc: Lennert Buytenhek <> Cc: "John W. Linville" <> Signed-off-by: Andrew Morton <> Signed-off-by: Linus Torvalds <>
2014-08-08ipw2100: use pci_zalloc_consistentJoe Perches1-11/+5
Remove the now unnecessary memset too. Signed-off-by: Joe Perches <> Cc: Stanislav Yakovlev <> Cc: "John W. Linville" <> Signed-off-by: Andrew Morton <> Signed-off-by: Linus Torvalds <>
2014-08-06net: fix USB network driver config option.Francois Romieu1-0/+1
It must be tristate to avoid broken dependencies with kernel built-in usb network drivers when usb support is module only. When net config option is set, least surprize default should match usb. Wireless RNDIS USB driver used to select USB_USBNET. USB_USBNET now depends on USB_NET_DRIVERS so the latter should be selected as well. Signed-off-by: Francois Romieu <> Signed-off-by: David S. Miller <>
2014-08-06Merge git:// Torvalds306-4024/+18790
Pull networking updates from David Miller: "Highlights: 1) Steady transitioning of the BPF instructure to a generic spot so all kernel subsystems can make use of it, from Alexei Starovoitov. 2) SFC driver supports busy polling, from Alexandre Rames. 3) Take advantage of hash table in UDP multicast delivery, from David Held. 4) Lighten locking, in particular by getting rid of the LRU lists, in inet frag handling. From Florian Westphal. 5) Add support for various RFC6458 control messages in SCTP, from Geir Ola Vaagland. 6) Allow to filter bridge forwarding database dumps by device, from Jamal Hadi Salim. 7) virtio-net also now supports busy polling, from Jason Wang. 8) Some low level optimization tweaks in pktgen from Jesper Dangaard Brouer. 9) Add support for ipv6 address generation modes, so that userland can have some input into the process. From Jiri Pirko. 10) Consolidate common TCP connection request code in ipv4 and ipv6, from Octavian Purdila. 11) New ARP packet logger in netfilter, from Pablo Neira Ayuso. 12) Generic resizable RCU hash table, with intial users in netlink and nftables. From Thomas Graf. 13) Maintain a name assignment type so that userspace can see where a network device name came from (enumerated by kernel, assigned explicitly by userspace, etc.) From Tom Gundersen. 14) Automatic flow label generation on transmit in ipv6, from Tom Herbert. 15) New packet timestamping facilities from Willem de Bruijn, meant to assist in measuring latencies going into/out-of the packet scheduler, latency from TCP data transmission to ACK, etc" * git:// (1536 commits) cxgb4 : Disable recursive mailbox commands when enabling vi net: reduce USB network driver config options. tg3: Modify tg3_tso_bug() to handle multiple TX rings amd-xgbe: Perform phy connect/disconnect at dev open/stop amd-xgbe: Use dma_set_mask_and_coherent to set DMA mask net: sun4i-emac: fix memory leak on bad packet sctp: fix possible seqlock seadlock in sctp_packet_transmit() Revert "net: phy: Set the driver when registering an MDIO bus device" cxgb4vf: Turn off SGE RX/TX Callback Timers and interrupts in PCI shutdown routine team: Simplify return path of team_newlink bridge: Update outdated comment on promiscuous mode net-timestamp: ACK timestamp for bytestreams net-timestamp: TCP timestamping net-timestamp: SCHED timestamp on entering packet scheduler net-timestamp: add key to disambiguate concurrent datagrams net-timestamp: move timestamp flags out of sk_flags net-timestamp: extend SCM_TIMESTAMPING ancillary data struct cxgb4i : Move stray CPL definitions to cxgb4 driver tcp: reduce spurious retransmits due to transient SACK reneging qlcnic: Initialize dcbnl_ops before register_netdev ...
2014-08-05Merge branch 'timers-core-for-linus' of ↵Linus Torvalds1-5/+2
git:// Pull timer and time updates from Thomas Gleixner: "A rather large update of timers, timekeeping & co - Core timekeeping code is year-2038 safe now for 32bit machines. Now we just need to fix all in kernel users and the gazillion of user space interfaces which rely on timespec/timeval :) - Better cache layout for the timekeeping internal data structures. - Proper nanosecond based interfaces for in kernel users. - Tree wide cleanup of code which wants nanoseconds but does hoops and loops to convert back and forth from timespecs. Some of it definitely belongs into the ugly code museum. - Consolidation of the timekeeping interface zoo. - A fast NMI safe accessor to clock monotonic for tracing. This is a long standing request to support correlated user/kernel space traces. With proper NTP frequency correction it's also suitable for correlation of traces accross separate machines. - Checkpoint/restart support for timerfd. - A few NOHZ[_FULL] improvements in the [hr]timer code. - Code move from kernel to kernel/time of all time* related code. - New clocksource/event drivers from the ARM universe. I'm really impressed that despite an architected timer in the newer chips SoC manufacturers insist on inventing new and differently broken SoC specific timers. [ Ed. "Impressed"? I don't think that word means what you think it means ] - Another round of code move from arch to drivers. Looks like most of the legacy mess in ARM regarding timers is sorted out except for a few obnoxious strongholds. - The usual updates and fixlets all over the place" * 'timers-core-for-linus' of git:// (114 commits) timekeeping: Fixup typo in update_vsyscall_old definition clocksource: document some basic timekeeping concepts timekeeping: Use cached ntp_tick_length when accumulating error timekeeping: Rework frequency adjustments to work better w/ nohz timekeeping: Minor fixup for timespec64->timespec assignment ftrace: Provide trace clocks monotonic timekeeping: Provide fast and NMI safe access to CLOCK_MONOTONIC seqcount: Add raw_write_seqcount_latch() seqcount: Provide raw_read_seqcount() timekeeping: Use tk_read_base as argument for timekeeping_get_ns() timekeeping: Create struct tk_read_base and use it in struct timekeeper timekeeping: Restructure the timekeeper some more clocksource: Get rid of cycle_last clocksource: Move cycle_last validation to core code clocksource: Make delta calculation a function wireless: ath9k: Get rid of timespec conversions drm: vmwgfx: Use nsec based interfaces drm: i915: Use nsec based interfaces timekeeping: Provide ktime_get_raw() hangcheck-timer: Use ktime_get_ns() ...
2014-08-05Merge tag 'master-2014-07-31' of ↵David S. Miller41-112/+4837
git:// Conflicts: net/6lowpan/iphc.c Minor conflicts in iphc.c were changes overlapping with some style cleanups. John W. Linville says: ==================== Please pull this last(?) batch of wireless change intended for the 3.17 stream... For the NFC bits, Samuel says: "This is a rather quiet one, we have: - A new driver from ST Microelectronics for their NCI ST21NFCB, including device tree support. - p2p support for the ST21NFCA driver - A few fixes an enhancements for the NFC digital laye" For the Atheros bits, Kalle says: "Michal and Janusz did some important RX aggregation fixes, basically we were missing RX reordering altogether. The 10.1 firmware doesn't support Ad-Hoc mode and Michal fixed ath10k so that it doesn't advertise Ad-Hoc support with that firmware. Also he implemented a workaround for a KVM issue." For the Bluetooth bits, Gustavo and Johan say: "To quote Gustavo from his previous request: 'Some last minute fixes for -next. We have a fix for a use after free in RFCOMM, another fix to an issue with ADV_DIRECT_IND and one for ADV_IND with auto-connection handling. Last, we added support for reading the codec and MWS setting for controllers that support these features.' Additionally there are fixes to LE scanning, an update to conform to the 4.1 core specification as well as fixes for tracking the page scan state. All of these fixes are important for 3.17." And, "We've got: - 6lowpan fixes/cleanups - A couple crash fixes, one for the Marvell HCI driver and another in LE SMP. - Fix for an incorrect connected state check - Fix for the bondable requirement during pairing (an issue which had crept in because of using "pairable" when in fact the actual meaning was "bondable" (these have different meanings in Bluetooth)" Along with those are some late-breaking hardware support patches in brcmfmac and b43 as well as a stray ath9k patch. ==================== Signed-off-by: David S. Miller <>
2014-07-31b43: N-PHY: fix "Data bus error" while working in 5 GHzRafał Miłecki1-0/+3
When switching from one 5 GHz channel to another 5 GHz channel we need to make sure BPHY is still in a reset. However to access BPHY register we have to switch to 2 GHz mode for a moment. Otherwise this may result in "Data bus error" (noticed by Hauke with BCM43224 connected to the SoC). Reported-by: Hauke Mehrtens <> Signed-off-by: Rafał Miłecki <> Signed-off-by: John W. Linville <>
2014-07-31b43: update PHY descriptions in KconfigRafał Miłecki1-13/+9
Add lists of chipsets, so people can enable support for their device easier (at least after checking lspci). Signed-off-by: Rafał Miłecki <> Signed-off-by: John W. Linville <>