Netdev List
 help / color / mirror / Atom feed
* net [BUG-FIX][PATCH 1/1] udplite: fast-path computation of checksum coverage
From: Gerrit Renker @ 2011-10-17 21:34 UTC (permalink / raw)
  To: David S. Miller, netdev

Hi Dave,

can you please consider the fix below -- the checksum coverage in UDP-Lite had been broken for
over half a year; then reported by Thomas. I have tested the patch below in various scenarios
with IPv4 and IPv6, on localhost, and between multiple hosts.

Gerrit

>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> Patch <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<

udplite: fast-path computation of checksum coverage

Commit 903ab86d195cca295379699299c5fc10beba31c7 of 1 March this year ("udp: Add
lockless transmit path") introduced a new fast TX path that broke the checksum
coverage computation of UDP-lite, which so far depended on up->len (only set
if the socket is locked and 0 in the fast path).

Fixed by providing both fast- and slow-path computation of checksum coverage.
The latter can be removed when UDP(-lite)v6 also uses a lockless transmit path.
 
Reported-by: Thomas Volkert <thomas@homer-conferencing.com>
Signed-off-by: Gerrit Renker <gerrit@erg.abdn.ac.uk>
---
 include/net/udplite.h |   63 ++++++++++++++++++++++++--------------------------
 1 file changed, 31 insertions(+), 32 deletions(-)

--- a/include/net/udplite.h
+++ b/include/net/udplite.h
@@ -66,40 +66,34 @@ static inline int udplite_checksum_init(struct sk_buff *skb, struct udphdr *uh)
 	return 0;
 }
 
-static inline int udplite_sender_cscov(struct udp_sock *up, struct udphdr *uh)
+/* Slow-path computation of checksum. Socket is locked. */
+static inline __wsum udplite_csum_outgoing(struct sock *sk, struct sk_buff *skb)
 {
+	const struct udp_sock *up = udp_sk(skb->sk);
 	int cscov = up->len;
+	__wsum csum = 0;
 
-	/*
-	 * Sender has set `partial coverage' option on UDP-Lite socket
-	 */
-	if (up->pcflag & UDPLITE_SEND_CC)    {
+	if (up->pcflag & UDPLITE_SEND_CC) {
+		/*
+		 * Sender has set `partial coverage' option on UDP-Lite socket.
+		 * The special case "up->pcslen == 0" signifies full coverage.
+		 */
 		if (up->pcslen < up->len) {
-		/* up->pcslen == 0 means that full coverage is required,
-		 * partial coverage only if  0 < up->pcslen < up->len */
-			if (0 < up->pcslen) {
-			       cscov = up->pcslen;
-			}
-			uh->len = htons(up->pcslen);
+			if (0 < up->pcslen)
+				cscov = up->pcslen;
+			udp_hdr(skb)->len = htons(up->pcslen);
 		}
-	/*
-	 * NOTE: Causes for the error case  `up->pcslen > up->len':
-	 *        (i)  Application error (will not be penalized).
-	 *       (ii)  Payload too big for send buffer: data is split
-	 *             into several packets, each with its own header.
-	 *             In this case (e.g. last segment), coverage may
-	 *             exceed packet length.
-	 *       Since packets with coverage length > packet length are
-	 *       illegal, we fall back to the defaults here.
-	 */
+		/*
+		 * NOTE: Causes for the error case  `up->pcslen > up->len':
+		 *        (i)  Application error (will not be penalized).
+		 *       (ii)  Payload too big for send buffer: data is split
+		 *             into several packets, each with its own header.
+		 *             In this case (e.g. last segment), coverage may
+		 *             exceed packet length.
+		 *       Since packets with coverage length > packet length are
+		 *       illegal, we fall back to the defaults here.
+		 */
 	}
-	return cscov;
-}
-
-static inline __wsum udplite_csum_outgoing(struct sock *sk, struct sk_buff *skb)
-{
-	int cscov = udplite_sender_cscov(udp_sk(sk), udp_hdr(skb));
-	__wsum csum = 0;
 
 	skb->ip_summed = CHECKSUM_NONE;     /* no HW support for checksumming */
 
@@ -115,16 +109,21 @@ static inline __wsum udplite_csum_outgoing(struct sock *sk, struct sk_buff *skb)
 	return csum;
 }
 
+/* Fast-path computation of checksum. Socket may not be locked. */
 static inline __wsum udplite_csum(struct sk_buff *skb)
 {
-	struct sock *sk = skb->sk;
-	int cscov = udplite_sender_cscov(udp_sk(sk), udp_hdr(skb));
+	const struct udp_sock *up = udp_sk(skb->sk);
 	const int off = skb_transport_offset(skb);
-	const int len = skb->len - off;
+	int len = skb->len - off;
 
+	if ((up->pcflag & UDPLITE_SEND_CC) && up->pcslen < len) {
+		if (0 < up->pcslen)
+			len = up->pcslen;
+		udp_hdr(skb)->len = htons(up->pcslen);
+	}
 	skb->ip_summed = CHECKSUM_NONE;     /* no HW support for checksumming */
 
-	return skb_checksum(skb, off, min(cscov, len), 0);
+	return skb_checksum(skb, off, len, 0);
 }
 
 extern void	udplite4_register(void);

^ permalink raw reply

* Re: [PATCH] net: ipv6: Allow netlink to set IPv6 address scope
From: Brian Haley @ 2011-10-17 21:32 UTC (permalink / raw)
  To: Lorenzo Colitti; +Cc: maze, yoshfuji, netdev
In-Reply-To: <CAKD1Yr0mnSM5EyVhJDPyq3Obe2WNiEjgQ=0uQ-r39Fg9WTsVmw@mail.gmail.com>

On 10/16/2011 10:26 PM, Lorenzo Colitti wrote:
> RFC 3879 deprecated site-local addresses because the were non-unique and thus
> ambiguous, and if they leak, they cause problems. This is not an issue
> in the use
> case I presented, because the addresses are syntactically global
> addresses - they
> just don't have global reachability.

Not very global then :(

>> The MIF problem statement (in the RFC editor's queue) talks about this problem,
>> http://tools.ietf.org/html/draft-ietf-mif-problem-statement-15 - perhaps it's
>> better to work there to develop a more generic solution (using DHCPv6, RA
>> options, etc) before making this change?
> 
> I don't think it's a good idea. Waiting for an IETF working group to
> produce a standard
> when it doesn't even have a problem statement finalized could take years.

It would be useful to give some input there, even if the Linux-specific
implementation of any standard plays with bits in the ifaddr.

> Is there another reason why we shouldn't enable userspace to do what it wants?

In my opinion it just feels like a hack, because things won't work when your
wifi attaches to a walled garden, or there's a third interface - who wins the
tiebreaker?

I do see your point that it will help with the problem you're trying to solve,
hopefully someone else will offer their opinion.

-Brian

^ permalink raw reply

* Re: [PATCH 2/2] bridge: allow forwarding some link local frames
From: Ed Swierk @ 2011-10-17 21:09 UTC (permalink / raw)
  To: Ross Brattain; +Cc: Stephen Hemminger, David S. Miller, netdev@vger.kernel.org
In-Reply-To: <20111017135323.00003ee5@unknown>

Interesting, I didn't realize LLDP could use any of those addresses.

I finally got a peek at the hot-off-the-presses IEEE 802.1Q-2011, and
notice that 01-80-C2-00-00-0E is now assigned as "Individual LAN Scope
group address, Nearest bridge group address" rather than dedicated to
LLDP specifically.

Since our application is generating the LLDP frames we could change it
to use -00 or -03 and let the Linux bridge drop the -0E frames.

--Ed

On Mon, Oct 17, 2011 at 1:53 PM, Ross Brattain
<ross.b.brattain@intel.com> wrote:
> On Mon, 17 Oct 2011 07:35:53 -0700
> Ed Swierk <eswierk@bigswitch.com> wrote:
>
>> Why is forwarding LLDP (01-80-C2-00-00-0E) frames forbidden? I'm
>> testing LLDP in a virtual topology and need the bridge to forward
>> them.
>>
>> If we're worried about standards, there is justification for allowing
>> forwarding of LLDP frames. 802.1d-2005 specifies two classes of
>> bridge, customer (C-VLAN) and provider (S-VLAN). Customer bridge is
>> just new terminology for what was previously just called an
>> 802.1d-compliant bridge, while provider bridge is a new class that
>> transparently forwards certain control frames.
>
> 01-80-C2-00-00-0E should not pass the physical link.  If it does it will affect PFC 802.1Qbb and ETS 802.1Qaz.
>
> 802.1AB-2009 is more specific.  See Table 7-1 Group MAC addresses used by LLDP:
>
> Nearest bridge: 01-80-C2-00-00-0E
> Propagation constrained to a single physical link; stopped by all types of bridge
>
> Nearest non-TPMR bridge: 01-80-C2-00-00-03
> Propagation constrained by all bridges other than TPMRs; intended for use within provider bridged networks
>
> Nearest Customer Bridge: 01-80-C2-00-00-00
> Propagation constrained by customer bridges; this gives the same coverage as a customer-customer MACSec connection
>
>
> --
> Ross
>

^ permalink raw reply

* Re: realtek 8168 driver problem
From: Francois Romieu @ 2011-10-17 20:57 UTC (permalink / raw)
  To: HacKurx; +Cc: netdev
In-Reply-To: <CAFwXZv9pq+SZh7kY5kS3k9Jmnih9t++rvtuWvLH9VOAttE+RVw@mail.gmail.com>

HacKurx <hackurx@gmail.com> :
[...]
> A very annoying problem affects a large number of GNU/Linux distribution.
> Network card problem (with 8111/8168 chipset), As you can see:
[...]
> [    5.159689] r8169 0000:03:00.0: eth0: RTL8168b/8111b at 0xffffc9000178c000, 50:e5:49:52:8a:7f, XID 0c900800 IRQ 41

XID identifies your chipset as RTL_GIGA_MAC_VER_34. A recent r8169 kernel
driver would display something like :

[    x.xxxxxx] r8169 0000:03:00.0: eth0: RTL8168evl/8111evl at ...
                                         ^^^^^^^^^^^^^^^^^^

Your r8169 driver lacks support for the adequate chipset. Please try
current 3.1-rc. It should perform better.

-- 
Ueimor

^ permalink raw reply

* Re: sky2: only 10Mb/s
From: Pavel Matěja @ 2011-10-17 20:53 UTC (permalink / raw)
  To: netdev; +Cc: Stephen Hemminger
In-Reply-To: <20111017085647.346a37cb@nehalam.linuxnetplumber.net>

> > Hi,
> > I tested new kernel and I have found out I have only 10Mb/s link instead
> > of 100Mb/s to my router.
> > If I did the git bisect right it was caused by commit
> > 4fb99cd6ac4fe6d03a334a6f4ebb2bbfc4b479ed which was submitted by you.
> > 
> > My card is (lspci -v):
> > 05:00.0 Ethernet controller: Marvell Technology Group Ltd. Yukon Optima
> > 88E8059 [PCIe Gigabit Ethernet Controller with AVB] (rev 11)
> > 
> >         Subsystem: ASUSTeK Computer Inc. Device 8439
> >         Flags: bus master, fast devsel, latency 0, IRQ 80
> >         Memory at fe6fc000 (64-bit, non-prefetchable) [size=16K]
> >         I/O ports at b800 [size=256]
> >         Expansion ROM at fe6c0000 [disabled] [size=128K]
> >         Capabilities: [48] Power Management version 3
> >         Capabilities: [5c] MSI: Enable+ Count=1/1 Maskable- 64bit+
> >         Capabilities: [c0] Express Legacy Endpoint, MSI 00
> >         Capabilities: [100] Advanced Error Reporting
> >         Capabilities: [130] Device Serial Number a5-89-6d-ff-ff-30-cf-20
> >         Kernel driver in use: sky2
> > 
> > I'm quite sure it's related to Yukon Optima because "Ethernet controller:
> > Marvell Technology Group Ltd. 88E8056 PCI-E Gigabit Ethernet Controller"
> > in my work computer has 100Mb/s with the same kernel and driver.
> > 
> > I got no response on netdev@vger.kernel.org.
> > Can you help me?
> 
> What is output of dmesg for sky2.
>  dmesg | grep sky2

sky2: driver version 1.28                                                                                                                                                          
sky2 0000:05:00.0: PCI INT A -> GSI 51 (level, low) -> IRQ 51                                                                                                                      
sky2 0000:05:00.0: setting latency timer to 64                                                                                                                                     
sky2 0000:05:00.0: Yukon-2 Optima chip revision 1                                                                                                                                  
sky2 0000:05:00.0: irq 80 for MSI/MSI-X                                                                                                                                            
sky2 0000:05:00.0: eth0: addr 20:cf:30:6d:89:a5                                                                                                                                    
sky2 0000:05:00.0: eth0: enabling interface                                                                                                                                        
sky2 0000:05:00.0: eth0: Link is up at 10 Mbps, full duplex, flow control both                                                                                                     
-- 
Pavel Mateja

^ permalink raw reply

* Re: [PATCH 2/2] bridge: allow forwarding some link local frames
From: Ross Brattain @ 2011-10-17 20:53 UTC (permalink / raw)
  To: Ed Swierk; +Cc: Stephen Hemminger, David S. Miller, netdev@vger.kernel.org
In-Reply-To: <CAF5U64AYRhZ1e0=-RhSemgaOnewTQSpAoRY2FUrFr252PG98Pw@mail.gmail.com>

On Mon, 17 Oct 2011 07:35:53 -0700
Ed Swierk <eswierk@bigswitch.com> wrote:

> Why is forwarding LLDP (01-80-C2-00-00-0E) frames forbidden? I'm
> testing LLDP in a virtual topology and need the bridge to forward
> them.
> 
> If we're worried about standards, there is justification for allowing
> forwarding of LLDP frames. 802.1d-2005 specifies two classes of
> bridge, customer (C-VLAN) and provider (S-VLAN). Customer bridge is
> just new terminology for what was previously just called an
> 802.1d-compliant bridge, while provider bridge is a new class that
> transparently forwards certain control frames.

01-80-C2-00-00-0E should not pass the physical link.  If it does it will affect PFC 802.1Qbb and ETS 802.1Qaz.

802.1AB-2009 is more specific.  See Table 7-1 Group MAC addresses used by LLDP:

Nearest bridge: 01-80-C2-00-00-0E
Propagation constrained to a single physical link; stopped by all types of bridge

Nearest non-TPMR bridge: 01-80-C2-00-00-03
Propagation constrained by all bridges other than TPMRs; intended for use within provider bridged networks

Nearest Customer Bridge: 01-80-C2-00-00-00
Propagation constrained by customer bridges; this gives the same coverage as a customer-customer MACSec connection


--
Ross

^ permalink raw reply

* Re: [net-next 2/6] igb: Check if subordinate VFs are assigned to virtual machines
From: David Miller @ 2011-10-17 20:49 UTC (permalink / raw)
  To: jeffrey.t.kirsher
  Cc: gregory.v.rose, netdev, gospo, sassmann, konrad.wilk, benve,
	sathya.perla, dm, jdmason, james.smart
In-Reply-To: <1318852447.2960.50.camel@jtkirshe-mobl>

From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Date: Mon, 17 Oct 2011 04:54:06 -0700

> On Mon, 2011-10-17 at 04:32 -0700, Kirsher, Jeffrey T wrote:
>> From: Greg Rose <gregory.v.rose@intel.com>
>> 
>> Kvm and the Xen pci-back driver will set a flag in the virtual
>> function
>> pci device dev_flags when the VF is assigned to a guest VM.  Before
>> destroying subordinate VFs check to see if the flag is set and if so
>> skip the call to pci_disable_sriov() to avoid system crashes.
>> 
>> Copy the maintainer for the Xen pci-back driver.  Also CC'ing
>> maintainers of all drivers found to call pci_disable_sriov().
>> 
>> Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
>> Cc: Christian Benvenuti <benve@cisco.com>
>> Cc: Sathya Perla <sathya.perla@emulex.com>
>> Cc: Dimitris Michailidis <dm@chelsio.com>
>> Cc: Jon Mason <jdmason@kudzu.us>
>> Cc: James Smart <james.smart@emulex.com>
>> 
>> Signed-off-by: Greg Rose <gregory.v.rose@intel.com>
>> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> 
> 
> Dave- please do not pull this patch (or the series).  There is an issue
> with this patch.

Ok.

^ permalink raw reply

* [PATCH] Disable TCP_DEBUG and FASTRETRANS_DEBUG by default
From: Dan McGee @ 2011-10-17 20:25 UTC (permalink / raw)
  To: netdev
  Cc: David S. Miller, Alexey Kuznetsov, James Morris,
	Hideaki YOSHIFUJI, Patrick McHardy, linux-kernel

If these are truly debug options, they should be turned off by default
and can be tweaked if necessary. Fix one usage of the flag to use #if
instead of #ifdef so defining to zero is acceptable.

Signed-off-by: Dan McGee <dpmcgee@gmail.com>
---
 include/net/tcp.h    |    4 ++--
 net/ipv4/tcp_timer.c |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/net/tcp.h b/include/net/tcp.h
index acc620a..15236d0 100644
--- a/include/net/tcp.h
+++ b/include/net/tcp.h
@@ -18,8 +18,8 @@
 #ifndef _TCP_H
 #define _TCP_H
 
-#define TCP_DEBUG 1
-#define FASTRETRANS_DEBUG 1
+#define TCP_DEBUG 0
+#define FASTRETRANS_DEBUG 0
 
 #include <linux/list.h>
 #include <linux/tcp.h>
diff --git a/net/ipv4/tcp_timer.c b/net/ipv4/tcp_timer.c
index ecd44b0..31669e7 100644
--- a/net/ipv4/tcp_timer.c
+++ b/net/ipv4/tcp_timer.c
@@ -334,7 +334,7 @@ void tcp_retransmit_timer(struct sock *sk)
 		 * connection. If the socket is an orphan, time it out,
 		 * we cannot allow such beasts to hang infinitely.
 		 */
-#ifdef TCP_DEBUG
+#if TCP_DEBUG
 		struct inet_sock *inet = inet_sk(sk);
 		if (sk->sk_family == AF_INET) {
 			LIMIT_NETDEBUG(KERN_DEBUG "TCP: Peer %pI4:%u/%u unexpectedly shrunk window %u:%u (repaired)\n",
-- 
1.7.7

^ permalink raw reply related

* Re: pull request: wireless-next 2011-10-17
From: John W. Linville @ 2011-10-17 20:23 UTC (permalink / raw)
  To: davem-fT/PcQaiUtIeIZ0/mPfg9Q
  Cc: linux-wireless-u79uwXL29TY76Z2rM5mHXA,
	netdev-u79uwXL29TY76Z2rM5mHXA
In-Reply-To: <20111017191945.GD8948-2XuSBdqkA4R54TAoqtyWWQ@public.gmane.org>

[-- Attachment #1: Type: text/plain, Size: 30433 bytes --]

I neglected to identify the HEAD and sign...

commit 41ebe9cde738a972d05c7282e09f5ed54cff0e8d

Thanks,

John

On Mon, Oct 17, 2011 at 03:19:46PM -0400, John W. Linville wrote:
> Dave,
> 
> Here is one more (last?) wireless pull request intended for 3.2.
> 
> The most notable bits of this request are the long awaited brcm80211
> drivers.  Along with those come the usual strong showings from the
> iwlwifi and ath9k teams and some mac80211 updates from Johannes
> and others.  There are also updates for mwifiex, rtlwifi, wl12xx,
> and b43, as well as a few other random bits.
> 
> Please let me know if there are problems!
> 
> Thanks,
> 
> JOhn
> 
> ---
> 
> The following changes since commit fd38f734cb8200529e281338514945fcbff2364b:
> 
>   igbvf: convert to ndo_fix_features (2011-10-16 13:18:47 -0700)
> 
> are available in the git repository at:
>   git://git.infradead.org/users/linville/wireless-next.git for-davem
> 
> Alwin Beukers (9):
>       brcm80211: cleanup function prototypes
>       brcm80211: removed unused functions
>       brcm80211: moved power conversion functions
>       brcm80211: moved function brcmu_chipname
>       brcm80211: moved function brcmu_parse_tlvs
>       brcm80211: moved function brcmu_chspec_malformed
>       brcm80211: moved function brcmu_mkiovar
>       brcm80211: moved function brcmu_format_flags
>       brcm80211: removed file wifi.c
> 
> Amitkumar Karwar (3):
>       mwifiex: add support for Marvell pcie8766 chipset
>       mwifiex: use separate wait condition for each command node
>       mwifiex: fix make namespacecheck warnings
> 
> Arend van Spriel (11):
>       net: wireless: add brcm80211 drivers
>       brcm80211: remove sparse warning in fullmac debug function
>       brcm80211: fix sparse endianess error in mac80211_if.c
>       brcm80211: add endian annotation to packet filter structures
>       brcm80211: rename variable in _brcmf_set_multicast_list()
>       brcm80211: fix annotations in TOE configuration functions
>       brcm80211: use endian annotations in scan related function
>       brcm80211: use endian annotation for pmk related structure
>       brcm80211: use endian annotations for assoc ie length request
>       brcm80211: use endian annotation for roaming related parameters
>       brcm80211: use endian annotation for scan time configuration
> 
> Chaoming Li (4):
>       rtlwifi: Update to new Realtek version - Part I
>       rtlwifi: rtl8192ce: Add new chip revisions
>       rtlwifi: rtl8192se: Updates from latest Realtek driver version - Part II
>       rtlwifi: rtl8192de: Updates from latest Reaktek driver - Part III
> 
> Dan Carpenter (3):
>       ath5k: remove some unneeded error handling code
>       ath9k: remove some bogus error handling code
>       iwmc3200wifi: add a range check to iwm_cfg80211_get_key()
> 
> Daniel Drake (1):
>       libertas: fix changing interface type when interface is down
> 
> Don Fry (1):
>       iwlagn: eliminate bus pointer from iwl_priv structure
> 
> Eliad Peller (2):
>       wl12xx: configure rate policy for p2p operations
>       wl12xx: disable AP-mode-specific quirks
> 
> Emmanuel Grumbach (7):
>       iwlagn: kill hw_params.max_stations
>       iwlagn: fix a race in the unmapping of the TFDs
>       iwlagn: warn only once if AGG state is wrong
>       iwlagn: move iwl_beacon_time_mask_XXX near to usage
>       iwlagn: move iwl_enable_rfkill_int and kill iwl-helpers.h
>       iwlagn: remove uneeded include to iwl-dev.h
>       iwlagn: add missing include to iwl-agn-rs.h
> 
> Felix Fietkau (11):
>       ath9k: indicate which queues are blocked when stopping tx fails
>       ath9k: keep track of what's triggering hardware resets
>       ath9k: improve PS filter clearing and retry counting for A-MPDU
>       ath9k: fix retry counting / BAR handling during queue flush
>       ath9k: disable unnecessary PHY error reporting
>       ath9k_hw: make ath9k_hw_set_interrupts use ah->imask by default
>       ath9k_hw: clean up tx power handling
>       ath: remove ath_regulatory::current_rd_ext
>       ath9k_hw: remove EEP_REG_1
>       ath9k_hw: fix a regression in key miss handling
>       ath9k: only send FCS-fail packets to mac80211 if requested
> 
> Helmut Schaa (5):
>       mac80211: Update injection documentation
>       mac80211: Build TX radiotap header dynamically
>       mac80211: Populate radiotap header with MCS info for TX frames
>       nl80211: Add sta_flags to the station info
>       mac80211: Provide station flags to cfg80211
> 
> Javier Cardona (1):
>       mac80211: Fix regression that allowed mpaths between non-peers.
> 
> Johannes Berg (16):
>       mac80211: pass no-CCK flag through to HW scan
>       mac80211: fix offchannel TX cookie matching
>       mac80211: optimise monitor xmit
>       mac80211: remove tx_data ethertype
>       mac80211: move fragment flag to info flag as dont-fragment
>       mac80211: parse radiotap header earlier
>       mac80211: dont adjust truesize
>       mac80211: dont orphan TX skb
>       iwlagn: update beacon smarter
>       iwlagn: don't assign seqno to QoS Null frames
>       iwlagn: send simple LQ command for WoWLAN
>       iwlagn: stop interrupts when suspending
>       iwlagn: remove 5000 hw header
>       iwlagn: remove 6000 hw header
>       mac80211: reformat TX unauthorised check
>       mac80211: fix TID for null poll response
> 
> John W. Linville (2):
>       Merge branch 'for-linville' of git://github.com/lucacoelho/wl12xx
>       Merge branch 'master' of git://git.infradead.org/users/linville/wireless-next into for-davem
> 
> Larry Finger (2):
>       rtlwifi: Change debug parameter to apply to individual drivers
>       rtlwifi: Change PCI drivers to use the new PM framework
> 
> Luciano Coelho (1):
>       wl12xx: set max_sched_scan_ie_len correctly
> 
> Rafał Miłecki (3):
>       b43: trivial: do not report any link quality instead of invalid one
>       Revert "b43: trivial: do not report any link quality instead of invalid one"
>       b43: N-PHY: report signal to mac80211
> 
> Rajkumar Manoharan (14):
>       ath9k_hw: Fix ASPM L1 issue for AR9480
>       ath9k_hw: Updated ar9003 initval table for AR9380
>       ath9k_hw: Update AR9003 initval to improve phase noise
>       ath9k_hw: Updated AR9003 tx gain table for 5GHz
>       ath9k_hw: Improve fast channel change for AR9003 chips
>       ath9k_hw: Add support to reuse TxIQ cal measurements
>       ath9k_hw: Add support to reuse Carrier leak calibration
>       ath9k_hw: Cleanup Tx calibrations for AR9003 chips
>       ath9k_hw: Support fast channel change on 5GHz for AR9003 chips
>       ath9k_hw: Update normal/min noise floor value for AR9480
>       ath9k_hw: Add radio retention support for AR9480
>       ath9k_hw: Do fast channel change based on reusable calibration results
>       ath9k_hw: Rename AR9480 -> AR9462 initvals
>       ath9k: Rename AR9480 into AR9462
> 
> Roland Vossen (3):
>       brcm80211: smac: removed redundant timer function parameters
>       brcm80211: smac: decreased timer callback irq level
>       brcm80211: fmac: fixed weird indentation
> 
> Shahar Levi (1):
>       wl12xx: Add support for HW channel switch
> 
> Stanislaw Gruszka (1):
>       iwlagn: fix priv->cfg->ht_params NULL pointer dereference
> 
> Stephen Rothwell (2):
>       net: wireless: brcm80211: replace ndo_set_multicast_list  with ndo_set_rx_mode
>       net: wireless: brcm80210: include module.h
> 
> Wey-Yi Guy (20):
>       iwlagn: separate init calib and rt calib
>       iwlagn: add cmd queue pointer info when timeout
>       iwlagn: add REPLY_ECHO host command
>       iwlagn: add WARN if tx cmd complete come back late
>       iwlagn: add "echo" test when command queue stuck
>       iwlagn: check rf kill in queue stuck
>       iwlagn: add "echo test" command to debugfs
>       iwlagn: remove un-necessary step
>       iwlagn: set rts retry limit
>       iwlagn: add "_d" sku to 6005 series of devices
>       iwlagn: Add "_d" sku to 105 series of devices
>       iwlagn: do nothing when disable agg in wrong state
>       iwlagn: use low retry limit for WoWLAN
>       iwlwifi: update comments on how to enable debug flag
>       iwlagn: more info on warning for shutdown agg queue
>       iwlagn: don't stop rts/cts until last aggregation queue close
>       iwlagn: add debug for mac80211 callback
>       iwlagn: rename all the mac80211 callback functions
>       iwlagn: merge station management functions
>       iwlagn: rename iwl-rx.c to iwl-agn-rx.c
> 
> Yogesh Ashok Powar (1):
>       mwifiex: fix smatch errors
> 
>  Documentation/networking/mac80211-injection.txt    |    4 +
>  drivers/net/wireless/Kconfig                       |    1 +
>  drivers/net/wireless/Makefile                      |    3 +
>  drivers/net/wireless/ath/ath.h                     |    2 -
>  drivers/net/wireless/ath/ath5k/base.c              |    6 -
>  drivers/net/wireless/ath/ath9k/Makefile            |    1 +
>  drivers/net/wireless/ath/ath9k/ani.c               |    5 -
>  drivers/net/wireless/ath/ath9k/ar5008_phy.c        |   11 +-
>  .../net/wireless/ath/ath9k/ar9003_2p2_initvals.h   |  172 +-
>  drivers/net/wireless/ath/ath9k/ar9003_calib.c      |  250 +-
>  drivers/net/wireless/ath/ath9k/ar9003_eeprom.c     |   59 +-
>  drivers/net/wireless/ath/ath9k/ar9003_hw.c         |  186 +-
>  drivers/net/wireless/ath/ath9k/ar9003_mac.c        |    4 +-
>  drivers/net/wireless/ath/ath9k/ar9003_paprd.c      |   15 +-
>  drivers/net/wireless/ath/ath9k/ar9003_phy.c        |   97 +-
>  drivers/net/wireless/ath/ath9k/ar9003_phy.h        |   52 +-
>  drivers/net/wireless/ath/ath9k/ar9003_rtt.c        |  153 +
>  drivers/net/wireless/ath/ath9k/ar9003_rtt.h        |   28 +
>  ...ar9480_1p0_initvals.h => ar9462_1p0_initvals.h} |   62 +-
>  ...ar9480_2p0_initvals.h => ar9462_2p0_initvals.h} |   68 +-
>  drivers/net/wireless/ath/ath9k/ath9k.h             |    2 +-
>  drivers/net/wireless/ath/ath9k/beacon.c            |   10 +-
>  drivers/net/wireless/ath/ath9k/common.c            |    6 +-
>  drivers/net/wireless/ath/ath9k/debug.c             |   19 +-
>  drivers/net/wireless/ath/ath9k/debug.h             |   13 +
>  drivers/net/wireless/ath/ath9k/eeprom.h            |   10 +-
>  drivers/net/wireless/ath/ath9k/eeprom_4k.c         |   29 +-
>  drivers/net/wireless/ath/ath9k/eeprom_9287.c       |   35 +-
>  drivers/net/wireless/ath/ath9k/eeprom_def.c        |   45 +-
>  drivers/net/wireless/ath/ath9k/gpio.c              |    8 +-
>  drivers/net/wireless/ath/ath9k/hw-ops.h            |    7 +
>  drivers/net/wireless/ath/ath9k/hw.c                |  158 +-
>  drivers/net/wireless/ath/ath9k/hw.h                |   39 +-
>  drivers/net/wireless/ath/ath9k/init.c              |    2 -
>  drivers/net/wireless/ath/ath9k/mac.c               |   10 +-
>  drivers/net/wireless/ath/ath9k/mac.h               |    6 +-
>  drivers/net/wireless/ath/ath9k/main.c              |   25 +-
>  drivers/net/wireless/ath/ath9k/pci.c               |    2 +-
>  drivers/net/wireless/ath/ath9k/recv.c              |   35 +-
>  drivers/net/wireless/ath/ath9k/reg.h               |   29 +-
>  drivers/net/wireless/ath/ath9k/xmit.c              |   40 +-
>  drivers/net/wireless/ath/carl9170/main.c           |    1 -
>  drivers/net/wireless/b43/xmit.c                    |   18 +-
>  drivers/net/wireless/b43/xmit.h                    |   10 +-
>  drivers/net/wireless/brcm80211/Kconfig             |   35 +
>  drivers/net/wireless/brcm80211/Makefile            |   23 +
>  drivers/net/wireless/brcm80211/brcmfmac/Makefile   |   33 +
>  drivers/net/wireless/brcm80211/brcmfmac/bcmchip.h  |   32 +
>  drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c   |  371 +
>  .../net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c |  626 +
>  drivers/net/wireless/brcm80211/brcmfmac/dhd.h      |  776 +
>  drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h  |   57 +
>  drivers/net/wireless/brcm80211/brcmfmac/dhd_cdc.c  |  498 +
>  .../net/wireless/brcm80211/brcmfmac/dhd_common.c   |  895 +
>  drivers/net/wireless/brcm80211/brcmfmac/dhd_dbg.h  |   58 +
>  .../net/wireless/brcm80211/brcmfmac/dhd_linux.c    | 1356 +
>  .../net/wireless/brcm80211/brcmfmac/dhd_proto.h    |   60 +
>  drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c | 4591 ++++
>  .../net/wireless/brcm80211/brcmfmac/sdio_host.h    |  252 +
>  .../net/wireless/brcm80211/brcmfmac/wl_cfg80211.c  | 3868 +++
>  .../net/wireless/brcm80211/brcmfmac/wl_cfg80211.h  |  375 +
>  drivers/net/wireless/brcm80211/brcmsmac/Makefile   |   51 +
>  drivers/net/wireless/brcm80211/brcmsmac/aiutils.c  | 2079 ++
>  drivers/net/wireless/brcm80211/brcmsmac/aiutils.h  |  378 +
>  drivers/net/wireless/brcm80211/brcmsmac/ampdu.c    | 1241 +
>  drivers/net/wireless/brcm80211/brcmsmac/ampdu.h    |   30 +
>  drivers/net/wireless/brcm80211/brcmsmac/antsel.c   |  307 +
>  drivers/net/wireless/brcm80211/brcmsmac/antsel.h   |   29 +
>  .../brcm80211/brcmsmac/brcms_trace_events.c        |   23 +
>  .../brcm80211/brcmsmac/brcms_trace_events.h        |   92 +
>  drivers/net/wireless/brcm80211/brcmsmac/channel.c  | 1591 ++
>  drivers/net/wireless/brcm80211/brcmsmac/channel.h  |   53 +
>  drivers/net/wireless/brcm80211/brcmsmac/d11.h      | 1898 ++
>  drivers/net/wireless/brcm80211/brcmsmac/dma.c      | 1425 +
>  drivers/net/wireless/brcm80211/brcmsmac/dma.h      |  120 +
>  .../net/wireless/brcm80211/brcmsmac/mac80211_if.c  | 1696 ++
>  .../net/wireless/brcm80211/brcmsmac/mac80211_if.h  |  108 +
>  drivers/net/wireless/brcm80211/brcmsmac/main.c     | 8775 ++++++
>  drivers/net/wireless/brcm80211/brcmsmac/main.h     |  735 +
>  drivers/net/wireless/brcm80211/brcmsmac/nicpci.c   |  835 +
>  drivers/net/wireless/brcm80211/brcmsmac/nicpci.h   |   82 +
>  drivers/net/wireless/brcm80211/brcmsmac/otp.c      |  426 +
>  drivers/net/wireless/brcm80211/brcmsmac/otp.h      |   36 +
>  .../net/wireless/brcm80211/brcmsmac/phy/phy_cmn.c  | 2988 ++
>  .../net/wireless/brcm80211/brcmsmac/phy/phy_hal.h  |  301 +
>  .../net/wireless/brcm80211/brcmsmac/phy/phy_int.h  | 1169 +
>  .../net/wireless/brcm80211/brcmsmac/phy/phy_lcn.c  | 5154 ++++
>  .../net/wireless/brcm80211/brcmsmac/phy/phy_lcn.h  |  121 +
>  .../net/wireless/brcm80211/brcmsmac/phy/phy_n.c    |28876 ++++++++++++++++++++
>  .../wireless/brcm80211/brcmsmac/phy/phy_qmath.c    |  308 +
>  .../wireless/brcm80211/brcmsmac/phy/phy_qmath.h    |   42 +
>  .../wireless/brcm80211/brcmsmac/phy/phy_radio.h    | 1533 ++
>  .../net/wireless/brcm80211/brcmsmac/phy/phyreg_n.h |  167 +
>  .../wireless/brcm80211/brcmsmac/phy/phytbl_lcn.c   | 3250 +++
>  .../wireless/brcm80211/brcmsmac/phy/phytbl_lcn.h   |   54 +
>  .../net/wireless/brcm80211/brcmsmac/phy/phytbl_n.c |10630 +++++++
>  .../net/wireless/brcm80211/brcmsmac/phy/phytbl_n.h |   50 +
>  drivers/net/wireless/brcm80211/brcmsmac/phy_shim.c |  225 +
>  drivers/net/wireless/brcm80211/brcmsmac/phy_shim.h |  182 +
>  drivers/net/wireless/brcm80211/brcmsmac/pmu.c      |  458 +
>  drivers/net/wireless/brcm80211/brcmsmac/pmu.h      |   38 +
>  drivers/net/wireless/brcm80211/brcmsmac/pub.h      |  634 +
>  drivers/net/wireless/brcm80211/brcmsmac/rate.c     |  514 +
>  drivers/net/wireless/brcm80211/brcmsmac/rate.h     |  250 +
>  drivers/net/wireless/brcm80211/brcmsmac/scb.h      |   82 +
>  drivers/net/wireless/brcm80211/brcmsmac/srom.c     | 1298 +
>  drivers/net/wireless/brcm80211/brcmsmac/srom.h     |   34 +
>  drivers/net/wireless/brcm80211/brcmsmac/stf.c      |  436 +
>  drivers/net/wireless/brcm80211/brcmsmac/stf.h      |   42 +
>  drivers/net/wireless/brcm80211/brcmsmac/types.h    |  352 +
>  .../net/wireless/brcm80211/brcmsmac/ucode_loader.c |  109 +
>  .../net/wireless/brcm80211/brcmsmac/ucode_loader.h |   58 +
>  drivers/net/wireless/brcm80211/brcmutil/Makefile   |   28 +
>  drivers/net/wireless/brcm80211/brcmutil/utils.c    |  386 +
>  .../net/wireless/brcm80211/include/brcm_hw_ids.h   |   59 +
>  .../net/wireless/brcm80211/include/brcmu_utils.h   |  195 +
>  .../net/wireless/brcm80211/include/brcmu_wifi.h    |  239 +
>  .../net/wireless/brcm80211/include/chipcommon.h    |  284 +
>  drivers/net/wireless/brcm80211/include/defs.h      |  104 +
>  drivers/net/wireless/brcm80211/include/soc.h       |   90 +
>  drivers/net/wireless/iwlwifi/Kconfig               |    4 +-
>  drivers/net/wireless/iwlwifi/Makefile              |    3 +-
>  drivers/net/wireless/iwlwifi/iwl-1000.c            |    3 -
>  drivers/net/wireless/iwlwifi/iwl-2000.c            |   10 +-
>  drivers/net/wireless/iwlwifi/iwl-5000-hw.h         |   88 -
>  drivers/net/wireless/iwlwifi/iwl-5000.c            |   22 +-
>  drivers/net/wireless/iwlwifi/iwl-6000-hw.h         |   81 -
>  drivers/net/wireless/iwlwifi/iwl-6000.c            |   12 +-
>  drivers/net/wireless/iwlwifi/iwl-agn-hw.h          |   15 +-
>  drivers/net/wireless/iwlwifi/iwl-agn-lib.c         |    2 -
>  drivers/net/wireless/iwlwifi/iwl-agn-rs.c          |    4 +-
>  drivers/net/wireless/iwlwifi/iwl-agn-rs.h          |    4 +
>  .../wireless/iwlwifi/{iwl-rx.c => iwl-agn-rx.c}    |  112 +-
>  drivers/net/wireless/iwlwifi/iwl-agn-rxon.c        |   10 +-
>  drivers/net/wireless/iwlwifi/iwl-agn-sta.c         |  861 +-
>  drivers/net/wireless/iwlwifi/iwl-agn-tx.c          |   32 +-
>  drivers/net/wireless/iwlwifi/iwl-agn-ucode.c       |    1 -
>  drivers/net/wireless/iwlwifi/iwl-agn.c             |  126 +-
>  drivers/net/wireless/iwlwifi/iwl-agn.h             |  131 +-
>  drivers/net/wireless/iwlwifi/iwl-cfg.h             |    2 +
>  drivers/net/wireless/iwlwifi/iwl-commands.h        |   11 +
>  drivers/net/wireless/iwlwifi/iwl-core.c            |   83 +-
>  drivers/net/wireless/iwlwifi/iwl-core.h            |   20 +-
>  drivers/net/wireless/iwlwifi/iwl-debug.h           |    8 +-
>  drivers/net/wireless/iwlwifi/iwl-debugfs.c         |   22 +-
>  drivers/net/wireless/iwlwifi/iwl-dev.h             |    3 -
>  drivers/net/wireless/iwlwifi/iwl-helpers.h         |   72 -
>  drivers/net/wireless/iwlwifi/iwl-led.c             |    3 +-
>  drivers/net/wireless/iwlwifi/iwl-pci.c             |    2 +
>  drivers/net/wireless/iwlwifi/iwl-power.c           |    2 +-
>  drivers/net/wireless/iwlwifi/iwl-scan.c            |    4 +-
>  drivers/net/wireless/iwlwifi/iwl-shared.h          |    2 -
>  drivers/net/wireless/iwlwifi/iwl-sta.c             |  835 -
>  drivers/net/wireless/iwlwifi/iwl-sta.h             |  141 -
>  drivers/net/wireless/iwlwifi/iwl-sv-open.c         |    8 +-
>  drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c   |    1 -
>  drivers/net/wireless/iwlwifi/iwl-trans-pcie-tx.c   |   23 +-
>  drivers/net/wireless/iwlwifi/iwl-trans-pcie.c      |   21 +-
>  drivers/net/wireless/iwmc3200wifi/cfg80211.c       |    6 +-
>  drivers/net/wireless/libertas/cfg.c                |   20 +-
>  drivers/net/wireless/libertas/decl.h               |    2 +
>  drivers/net/wireless/libertas/main.c               |   32 +
>  drivers/net/wireless/mwifiex/11n_aggr.c            |    3 +-
>  drivers/net/wireless/mwifiex/Kconfig               |   11 +
>  drivers/net/wireless/mwifiex/Makefile              |    3 +
>  drivers/net/wireless/mwifiex/cfp.c                 |   10 +-
>  drivers/net/wireless/mwifiex/cmdevt.c              |   34 +-
>  drivers/net/wireless/mwifiex/decl.h                |    1 -
>  drivers/net/wireless/mwifiex/fw.h                  |   36 +-
>  drivers/net/wireless/mwifiex/init.c                |   73 +-
>  drivers/net/wireless/mwifiex/main.c                |   10 +-
>  drivers/net/wireless/mwifiex/main.h                |   35 +-
>  drivers/net/wireless/mwifiex/pcie.c                | 1948 ++
>  drivers/net/wireless/mwifiex/pcie.h                |  148 +
>  drivers/net/wireless/mwifiex/scan.c                |   56 +-
>  drivers/net/wireless/mwifiex/sdio.c                |   19 +-
>  drivers/net/wireless/mwifiex/sdio.h                |   24 +-
>  drivers/net/wireless/mwifiex/sta_cmd.c             |   64 +
>  drivers/net/wireless/mwifiex/sta_cmdresp.c         |    2 +
>  drivers/net/wireless/mwifiex/sta_ioctl.c           |   12 +-
>  drivers/net/wireless/mwifiex/sta_tx.c              |    2 +-
>  drivers/net/wireless/mwifiex/txrx.c                |   45 +-
>  drivers/net/wireless/mwifiex/util.c                |    5 +-
>  drivers/net/wireless/mwifiex/util.h                |    9 +-
>  drivers/net/wireless/mwifiex/wmm.c                 |    4 +-
>  drivers/net/wireless/rtlwifi/base.c                |    6 +-
>  drivers/net/wireless/rtlwifi/debug.c               |    6 -
>  drivers/net/wireless/rtlwifi/pci.c                 |   19 +-
>  drivers/net/wireless/rtlwifi/pci.h                 |    4 +-
>  drivers/net/wireless/rtlwifi/rtl8192ce/def.h       |   14 +
>  drivers/net/wireless/rtlwifi/rtl8192ce/sw.c        |   35 +-
>  drivers/net/wireless/rtlwifi/rtl8192cu/def.h       |    4 -
>  drivers/net/wireless/rtlwifi/rtl8192cu/sw.c        |    7 +
>  drivers/net/wireless/rtlwifi/rtl8192de/def.h       |  135 +-
>  drivers/net/wireless/rtlwifi/rtl8192de/hw.c        |   15 +-
>  drivers/net/wireless/rtlwifi/rtl8192de/sw.c        |   21 +-
>  drivers/net/wireless/rtlwifi/rtl8192se/hw.c        |   22 +-
>  drivers/net/wireless/rtlwifi/rtl8192se/reg.h       |    1 +
>  drivers/net/wireless/rtlwifi/rtl8192se/sw.c        |   22 +-
>  drivers/net/wireless/rtlwifi/rtl8192se/trx.c       |   55 +-
>  drivers/net/wireless/rtlwifi/wifi.h                |    5 +
>  drivers/net/wireless/wl12xx/acx.c                  |   16 +
>  drivers/net/wireless/wl12xx/acx.h                  |    1 +
>  drivers/net/wireless/wl12xx/boot.c                 |    6 +-
>  drivers/net/wireless/wl12xx/cmd.c                  |   63 +-
>  drivers/net/wireless/wl12xx/cmd.h                  |   20 +
>  drivers/net/wireless/wl12xx/conf.h                 |    6 +-
>  drivers/net/wireless/wl12xx/event.c                |   15 +
>  drivers/net/wireless/wl12xx/main.c                 |   48 +-
>  drivers/net/wireless/wl12xx/wl12xx.h               |    7 +-
>  drivers/staging/Kconfig                            |    2 +-
>  drivers/staging/Makefile                           |    4 +-
>  include/linux/nl80211.h                            |    2 +
>  include/net/cfg80211.h                             |    5 +-
>  include/net/mac80211.h                             |   10 +-
>  net/mac80211/cfg.c                                 |   22 +-
>  net/mac80211/ieee80211_i.h                         |   15 +-
>  net/mac80211/main.c                                |    6 +-
>  net/mac80211/mesh_hwmp.c                           |    9 +
>  net/mac80211/scan.c                                |    1 +
>  net/mac80211/sta_info.c                            |    6 +-
>  net/mac80211/status.c                              |  137 +-
>  net/mac80211/tx.c                                  |  360 +-
>  net/mac80211/work.c                                |    2 +-
>  net/mac80211/wpa.c                                 |    3 +-
>  net/wireless/nl80211.c                             |    4 +
>  226 files changed, 102247 insertions(+), 2686 deletions(-)
>  create mode 100644 drivers/net/wireless/ath/ath9k/ar9003_rtt.c
>  create mode 100644 drivers/net/wireless/ath/ath9k/ar9003_rtt.h
>  rename drivers/net/wireless/ath/ath9k/{ar9480_1p0_initvals.h => ar9462_1p0_initvals.h} (97%)
>  rename drivers/net/wireless/ath/ath9k/{ar9480_2p0_initvals.h => ar9462_2p0_initvals.h} (97%)
>  create mode 100644 drivers/net/wireless/brcm80211/Kconfig
>  create mode 100644 drivers/net/wireless/brcm80211/Makefile
>  create mode 100644 drivers/net/wireless/brcm80211/brcmfmac/Makefile
>  create mode 100644 drivers/net/wireless/brcm80211/brcmfmac/bcmchip.h
>  create mode 100644 drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c
>  create mode 100644 drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c
>  create mode 100644 drivers/net/wireless/brcm80211/brcmfmac/dhd.h
>  create mode 100644 drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h
>  create mode 100644 drivers/net/wireless/brcm80211/brcmfmac/dhd_cdc.c
>  create mode 100644 drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c
>  create mode 100644 drivers/net/wireless/brcm80211/brcmfmac/dhd_dbg.h
>  create mode 100644 drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c
>  create mode 100644 drivers/net/wireless/brcm80211/brcmfmac/dhd_proto.h
>  create mode 100644 drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c
>  create mode 100644 drivers/net/wireless/brcm80211/brcmfmac/sdio_host.h
>  create mode 100644 drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
>  create mode 100644 drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.h
>  create mode 100644 drivers/net/wireless/brcm80211/brcmsmac/Makefile
>  create mode 100644 drivers/net/wireless/brcm80211/brcmsmac/aiutils.c
>  create mode 100644 drivers/net/wireless/brcm80211/brcmsmac/aiutils.h
>  create mode 100644 drivers/net/wireless/brcm80211/brcmsmac/ampdu.c
>  create mode 100644 drivers/net/wireless/brcm80211/brcmsmac/ampdu.h
>  create mode 100644 drivers/net/wireless/brcm80211/brcmsmac/antsel.c
>  create mode 100644 drivers/net/wireless/brcm80211/brcmsmac/antsel.h
>  create mode 100644 drivers/net/wireless/brcm80211/brcmsmac/brcms_trace_events.c
>  create mode 100644 drivers/net/wireless/brcm80211/brcmsmac/brcms_trace_events.h
>  create mode 100644 drivers/net/wireless/brcm80211/brcmsmac/channel.c
>  create mode 100644 drivers/net/wireless/brcm80211/brcmsmac/channel.h
>  create mode 100644 drivers/net/wireless/brcm80211/brcmsmac/d11.h
>  create mode 100644 drivers/net/wireless/brcm80211/brcmsmac/dma.c
>  create mode 100644 drivers/net/wireless/brcm80211/brcmsmac/dma.h
>  create mode 100644 drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
>  create mode 100644 drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.h
>  create mode 100644 drivers/net/wireless/brcm80211/brcmsmac/main.c
>  create mode 100644 drivers/net/wireless/brcm80211/brcmsmac/main.h
>  create mode 100644 drivers/net/wireless/brcm80211/brcmsmac/nicpci.c
>  create mode 100644 drivers/net/wireless/brcm80211/brcmsmac/nicpci.h
>  create mode 100644 drivers/net/wireless/brcm80211/brcmsmac/otp.c
>  create mode 100644 drivers/net/wireless/brcm80211/brcmsmac/otp.h
>  create mode 100644 drivers/net/wireless/brcm80211/brcmsmac/phy/phy_cmn.c
>  create mode 100644 drivers/net/wireless/brcm80211/brcmsmac/phy/phy_hal.h
>  create mode 100644 drivers/net/wireless/brcm80211/brcmsmac/phy/phy_int.h
>  create mode 100644 drivers/net/wireless/brcm80211/brcmsmac/phy/phy_lcn.c
>  create mode 100644 drivers/net/wireless/brcm80211/brcmsmac/phy/phy_lcn.h
>  create mode 100644 drivers/net/wireless/brcm80211/brcmsmac/phy/phy_n.c
>  create mode 100644 drivers/net/wireless/brcm80211/brcmsmac/phy/phy_qmath.c
>  create mode 100644 drivers/net/wireless/brcm80211/brcmsmac/phy/phy_qmath.h
>  create mode 100644 drivers/net/wireless/brcm80211/brcmsmac/phy/phy_radio.h
>  create mode 100644 drivers/net/wireless/brcm80211/brcmsmac/phy/phyreg_n.h
>  create mode 100644 drivers/net/wireless/brcm80211/brcmsmac/phy/phytbl_lcn.c
>  create mode 100644 drivers/net/wireless/brcm80211/brcmsmac/phy/phytbl_lcn.h
>  create mode 100644 drivers/net/wireless/brcm80211/brcmsmac/phy/phytbl_n.c
>  create mode 100644 drivers/net/wireless/brcm80211/brcmsmac/phy/phytbl_n.h
>  create mode 100644 drivers/net/wireless/brcm80211/brcmsmac/phy_shim.c
>  create mode 100644 drivers/net/wireless/brcm80211/brcmsmac/phy_shim.h
>  create mode 100644 drivers/net/wireless/brcm80211/brcmsmac/pmu.c
>  create mode 100644 drivers/net/wireless/brcm80211/brcmsmac/pmu.h
>  create mode 100644 drivers/net/wireless/brcm80211/brcmsmac/pub.h
>  create mode 100644 drivers/net/wireless/brcm80211/brcmsmac/rate.c
>  create mode 100644 drivers/net/wireless/brcm80211/brcmsmac/rate.h
>  create mode 100644 drivers/net/wireless/brcm80211/brcmsmac/scb.h
>  create mode 100644 drivers/net/wireless/brcm80211/brcmsmac/srom.c
>  create mode 100644 drivers/net/wireless/brcm80211/brcmsmac/srom.h
>  create mode 100644 drivers/net/wireless/brcm80211/brcmsmac/stf.c
>  create mode 100644 drivers/net/wireless/brcm80211/brcmsmac/stf.h
>  create mode 100644 drivers/net/wireless/brcm80211/brcmsmac/types.h
>  create mode 100644 drivers/net/wireless/brcm80211/brcmsmac/ucode_loader.c
>  create mode 100644 drivers/net/wireless/brcm80211/brcmsmac/ucode_loader.h
>  create mode 100644 drivers/net/wireless/brcm80211/brcmutil/Makefile
>  create mode 100644 drivers/net/wireless/brcm80211/brcmutil/utils.c
>  create mode 100644 drivers/net/wireless/brcm80211/include/brcm_hw_ids.h
>  create mode 100644 drivers/net/wireless/brcm80211/include/brcmu_utils.h
>  create mode 100644 drivers/net/wireless/brcm80211/include/brcmu_wifi.h
>  create mode 100644 drivers/net/wireless/brcm80211/include/chipcommon.h
>  create mode 100644 drivers/net/wireless/brcm80211/include/defs.h
>  create mode 100644 drivers/net/wireless/brcm80211/include/soc.h
>  delete mode 100644 drivers/net/wireless/iwlwifi/iwl-5000-hw.h
>  delete mode 100644 drivers/net/wireless/iwlwifi/iwl-6000-hw.h
>  rename drivers/net/wireless/iwlwifi/{iwl-rx.c => iwl-agn-rx.c} (91%)
>  delete mode 100644 drivers/net/wireless/iwlwifi/iwl-helpers.h
>  delete mode 100644 drivers/net/wireless/iwlwifi/iwl-sta.c
>  delete mode 100644 drivers/net/wireless/iwlwifi/iwl-sta.h
>  create mode 100644 drivers/net/wireless/mwifiex/pcie.c
>  create mode 100644 drivers/net/wireless/mwifiex/pcie.h
> -- 
> John W. Linville		Someday the world will need a hero, and you
> linville-2XuSBdqkA4R54TAoqtyWWQ@public.gmane.org			might be all we have.  Be ready.
> --
> To unsubscribe from this list: send the line "unsubscribe netdev" in
> the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> 

-- 
John W. Linville		Someday the world will need a hero, and you
linville-2XuSBdqkA4R54TAoqtyWWQ@public.gmane.org			might be all we have.  Be ready.

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

^ permalink raw reply

* [PATCH v2 2/2] can: remove references to berlios mailinglist
From: Marc Kleine-Budde @ 2011-10-17 19:32 UTC (permalink / raw)
  To: linux-can; +Cc: netdev, Marc Kleine-Budde
In-Reply-To: <1318879920-25280-1-git-send-email-mkl@pengutronix.de>

The BerliOS project, which currently hosts our mailinglist, will
close with the end of the year. Now take the chance and remove all
occurrences of the mailinglist address from the source files.

Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---

Changes since v1:
- remove mailinglist address altogether (tnx David).

 drivers/net/can/at91_can.c        |    2 --
 drivers/net/can/sja1000/sja1000.c |    2 --
 drivers/net/can/sja1000/sja1000.h |    2 --
 drivers/net/can/slcan.c           |    2 --
 drivers/net/can/vcan.c            |    2 --
 include/linux/can.h               |    2 --
 include/linux/can/bcm.h           |    2 --
 include/linux/can/core.h          |    2 --
 include/linux/can/dev.h           |    1 -
 include/linux/can/error.h         |    2 --
 include/linux/can/gw.h            |    2 --
 include/linux/can/netlink.h       |    2 --
 include/linux/can/raw.h           |    2 --
 net/can/af_can.c                  |    2 --
 net/can/af_can.h                  |    2 --
 net/can/bcm.c                     |    2 --
 net/can/gw.c                      |    2 --
 net/can/proc.c                    |    2 --
 net/can/raw.c                     |    2 --
 19 files changed, 0 insertions(+), 37 deletions(-)

diff --git a/drivers/net/can/at91_can.c b/drivers/net/can/at91_can.c
index 121ede6..044ea06 100644
--- a/drivers/net/can/at91_can.c
+++ b/drivers/net/can/at91_can.c
@@ -8,8 +8,6 @@
  * Public License ("GPL") version 2 as distributed in the 'COPYING'
  * file from the main directory of the linux kernel source.
  *
- * Send feedback to <socketcan-users@lists.berlios.de>
- *
  *
  * Your platform definition file should specify something like:
  *
diff --git a/drivers/net/can/sja1000/sja1000.c b/drivers/net/can/sja1000/sja1000.c
index f501bba..04a3f1b 100644
--- a/drivers/net/can/sja1000/sja1000.c
+++ b/drivers/net/can/sja1000/sja1000.c
@@ -40,8 +40,6 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
  * DAMAGE.
  *
- * Send feedback to <socketcan-users@lists.berlios.de>
- *
  */
 
 #include <linux/module.h>
diff --git a/drivers/net/can/sja1000/sja1000.h b/drivers/net/can/sja1000/sja1000.h
index 78bd4ec..23fff06 100644
--- a/drivers/net/can/sja1000/sja1000.h
+++ b/drivers/net/can/sja1000/sja1000.h
@@ -40,8 +40,6 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
  * DAMAGE.
  *
- * Send feedback to <socketcan-users@lists.berlios.de>
- *
  */
 
 #ifndef SJA1000_DEV_H
diff --git a/drivers/net/can/slcan.c b/drivers/net/can/slcan.c
index 4b70b7e..a979b00 100644
--- a/drivers/net/can/slcan.c
+++ b/drivers/net/can/slcan.c
@@ -35,8 +35,6 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
  * DAMAGE.
  *
- * Send feedback to <socketcan-users@lists.berlios.de>
- *
  */
 
 #include <linux/module.h>
diff --git a/drivers/net/can/vcan.c b/drivers/net/can/vcan.c
index a30b8f4..f93e2d6 100644
--- a/drivers/net/can/vcan.c
+++ b/drivers/net/can/vcan.c
@@ -37,8 +37,6 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
  * DAMAGE.
  *
- * Send feedback to <socketcan-users@lists.berlios.de>
- *
  */
 
 #include <linux/module.h>
diff --git a/include/linux/can.h b/include/linux/can.h
index bb047dc..9a19bcb 100644
--- a/include/linux/can.h
+++ b/include/linux/can.h
@@ -8,8 +8,6 @@
  * Copyright (c) 2002-2007 Volkswagen Group Electronic Research
  * All rights reserved.
  *
- * Send feedback to <socketcan-users@lists.berlios.de>
- *
  */
 
 #ifndef CAN_H
diff --git a/include/linux/can/bcm.h b/include/linux/can/bcm.h
index e96154d..3ebe387 100644
--- a/include/linux/can/bcm.h
+++ b/include/linux/can/bcm.h
@@ -7,8 +7,6 @@
  * Copyright (c) 2002-2007 Volkswagen Group Electronic Research
  * All rights reserved.
  *
- * Send feedback to <socketcan-users@lists.berlios.de>
- *
  */
 
 #ifndef CAN_BCM_H
diff --git a/include/linux/can/core.h b/include/linux/can/core.h
index 5ce6b5d..0ccc1cd 100644
--- a/include/linux/can/core.h
+++ b/include/linux/can/core.h
@@ -8,8 +8,6 @@
  * Copyright (c) 2002-2007 Volkswagen Group Electronic Research
  * All rights reserved.
  *
- * Send feedback to <socketcan-users@lists.berlios.de>
- *
  */
 
 #ifndef CAN_CORE_H
diff --git a/include/linux/can/dev.h b/include/linux/can/dev.h
index cc0bb49..a0969fc 100644
--- a/include/linux/can/dev.h
+++ b/include/linux/can/dev.h
@@ -8,7 +8,6 @@
  *
  * Copyright (C) 2008 Wolfgang Grandegger <wg@grandegger.com>
  *
- * Send feedback to <socketcan-users@lists.berlios.de>
  */
 
 #ifndef CAN_DEV_H
diff --git a/include/linux/can/error.h b/include/linux/can/error.h
index 5958074..63e855e 100644
--- a/include/linux/can/error.h
+++ b/include/linux/can/error.h
@@ -7,8 +7,6 @@
  * Copyright (c) 2002-2007 Volkswagen Group Electronic Research
  * All rights reserved.
  *
- * Send feedback to <socketcan-users@lists.berlios.de>
- *
  */
 
 #ifndef CAN_ERROR_H
diff --git a/include/linux/can/gw.h b/include/linux/can/gw.h
index 5527b54..8e1db18 100644
--- a/include/linux/can/gw.h
+++ b/include/linux/can/gw.h
@@ -7,8 +7,6 @@
  * Copyright (c) 2011 Volkswagen Group Electronic Research
  * All rights reserved.
  *
- * Send feedback to <socketcan-users@lists.berlios.de>
- *
  */
 
 #ifndef CAN_GW_H
diff --git a/include/linux/can/netlink.h b/include/linux/can/netlink.h
index 34542d3..14966dd 100644
--- a/include/linux/can/netlink.h
+++ b/include/linux/can/netlink.h
@@ -5,8 +5,6 @@
  *
  * Copyright (c) 2009 Wolfgang Grandegger <wg@grandegger.com>
  *
- * Send feedback to <socketcan-users@lists.berlios.de>
- *
  */
 
 #ifndef CAN_NETLINK_H
diff --git a/include/linux/can/raw.h b/include/linux/can/raw.h
index b2a0f87..781f3a3 100644
--- a/include/linux/can/raw.h
+++ b/include/linux/can/raw.h
@@ -8,8 +8,6 @@
  * Copyright (c) 2002-2007 Volkswagen Group Electronic Research
  * All rights reserved.
  *
- * Send feedback to <socketcan-users@lists.berlios.de>
- *
  */
 
 #ifndef CAN_RAW_H
diff --git a/net/can/af_can.c b/net/can/af_can.c
index d1ff515..0ce2ad0 100644
--- a/net/can/af_can.c
+++ b/net/can/af_can.c
@@ -38,8 +38,6 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
  * DAMAGE.
  *
- * Send feedback to <socketcan-users@lists.berlios.de>
- *
  */
 
 #include <linux/module.h>
diff --git a/net/can/af_can.h b/net/can/af_can.h
index 34253b8..fd882db 100644
--- a/net/can/af_can.h
+++ b/net/can/af_can.h
@@ -35,8 +35,6 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
  * DAMAGE.
  *
- * Send feedback to <socketcan-users@lists.berlios.de>
- *
  */
 
 #ifndef AF_CAN_H
diff --git a/net/can/bcm.c b/net/can/bcm.c
index c84963d..151b773 100644
--- a/net/can/bcm.c
+++ b/net/can/bcm.c
@@ -37,8 +37,6 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
  * DAMAGE.
  *
- * Send feedback to <socketcan-users@lists.berlios.de>
- *
  */
 
 #include <linux/module.h>
diff --git a/net/can/gw.c b/net/can/gw.c
index ac11407..3d79b12 100644
--- a/net/can/gw.c
+++ b/net/can/gw.c
@@ -37,8 +37,6 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
  * DAMAGE.
  *
- * Send feedback to <socketcan-users@lists.berlios.de>
- *
  */
 
 #include <linux/module.h>
diff --git a/net/can/proc.c b/net/can/proc.c
index 0016f73..ba873c3 100644
--- a/net/can/proc.c
+++ b/net/can/proc.c
@@ -37,8 +37,6 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
  * DAMAGE.
  *
- * Send feedback to <socketcan-users@lists.berlios.de>
- *
  */
 
 #include <linux/module.h>
diff --git a/net/can/raw.c b/net/can/raw.c
index dea99a6..cde1b4a 100644
--- a/net/can/raw.c
+++ b/net/can/raw.c
@@ -37,8 +37,6 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
  * DAMAGE.
  *
- * Send feedback to <socketcan-users@lists.berlios.de>
- *
  */
 
 #include <linux/module.h>
-- 
1.7.4.1

^ permalink raw reply related

* [PATCH v2 0/2] MAINTAINERS: can: the mailinglist moved to vger.kernel.org
From: Marc Kleine-Budde @ 2011-10-17 19:31 UTC (permalink / raw)
  To: linux-can; +Cc: netdev

Hello,

the BerliOS project will close with the end of the year, so we moved our
mailinglist to vger.kernel.org, it's now linux-can@vger.kernel.org.

This patch series change the mailinglist in MAINTAINERS and remove all other
references from the source tree. As David pointed out, automated tool will
use MAINTAINERS to gather this information.

cheers, Marc

The following changes since commit fd38f734cb8200529e281338514945fcbff2364b:

  igbvf: convert to ndo_fix_features (2011-10-16 13:18:47 -0700)

are available in the git repository at:
  git.pengutronix.de:/git/mkl/linux-2.6.git can/mailinglist-for-net-next

Marc Kleine-Budde (2):
      MAINTAINERS: can: the mailinglist moved to vger.kernel.org
      can: remove references to berlios mailinglist

 MAINTAINERS                       |    4 ++--
 drivers/net/can/at91_can.c        |    2 --
 drivers/net/can/sja1000/sja1000.c |    2 --
 drivers/net/can/sja1000/sja1000.h |    2 --
 drivers/net/can/slcan.c           |    2 --
 drivers/net/can/vcan.c            |    2 --
 include/linux/can.h               |    2 --
 include/linux/can/bcm.h           |    2 --
 include/linux/can/core.h          |    2 --
 include/linux/can/dev.h           |    1 -
 include/linux/can/error.h         |    2 --
 include/linux/can/gw.h            |    2 --
 include/linux/can/netlink.h       |    2 --
 include/linux/can/raw.h           |    2 --
 net/can/af_can.c                  |    2 --
 net/can/af_can.h                  |    2 --
 net/can/bcm.c                     |    2 --
 net/can/gw.c                      |    2 --
 net/can/proc.c                    |    2 --
 net/can/raw.c                     |    2 --
 20 files changed, 2 insertions(+), 39 deletions(-)

^ permalink raw reply

* [PATCH v2 1/2] MAINTAINERS: can: the mailinglist moved to vger.kernel.org
From: Marc Kleine-Budde @ 2011-10-17 19:31 UTC (permalink / raw)
  To: linux-can; +Cc: netdev, Marc Kleine-Budde
In-Reply-To: <1318879920-25280-1-git-send-email-mkl@pengutronix.de>

Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Acked-by: Oliver Hartkopp <socketcan@hartkopp.net>
---
 MAINTAINERS |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index aac56f9..5008b08 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1671,7 +1671,7 @@ CAN NETWORK LAYER
 M:	Oliver Hartkopp <socketcan@hartkopp.net>
 M:	Oliver Hartkopp <oliver.hartkopp@volkswagen.de>
 M:	Urs Thuermann <urs.thuermann@volkswagen.de>
-L:	socketcan-core@lists.berlios.de (subscribers-only)
+L:	linux-can@vger.kernel.org
 L:	netdev@vger.kernel.org
 W:	http://developer.berlios.de/projects/socketcan/
 S:	Maintained
@@ -1683,7 +1683,7 @@ F:	include/linux/can/raw.h
 
 CAN NETWORK DRIVERS
 M:	Wolfgang Grandegger <wg@grandegger.com>
-L:	socketcan-core@lists.berlios.de (subscribers-only)
+L:	linux-can@vger.kernel.org
 L:	netdev@vger.kernel.org
 W:	http://developer.berlios.de/projects/socketcan/
 S:	Maintained
-- 
1.7.4.1

^ permalink raw reply related

* pull request: wireless-next 2011-10-17
From: John W. Linville @ 2011-10-17 19:19 UTC (permalink / raw)
  To: davem-fT/PcQaiUtIeIZ0/mPfg9Q
  Cc: linux-wireless-u79uwXL29TY76Z2rM5mHXA,
	netdev-u79uwXL29TY76Z2rM5mHXA

Dave,

Here is one more (last?) wireless pull request intended for 3.2.

The most notable bits of this request are the long awaited brcm80211
drivers.  Along with those come the usual strong showings from the
iwlwifi and ath9k teams and some mac80211 updates from Johannes
and others.  There are also updates for mwifiex, rtlwifi, wl12xx,
and b43, as well as a few other random bits.

Please let me know if there are problems!

Thanks,

JOhn

---

The following changes since commit fd38f734cb8200529e281338514945fcbff2364b:

  igbvf: convert to ndo_fix_features (2011-10-16 13:18:47 -0700)

are available in the git repository at:
  git://git.infradead.org/users/linville/wireless-next.git for-davem

Alwin Beukers (9):
      brcm80211: cleanup function prototypes
      brcm80211: removed unused functions
      brcm80211: moved power conversion functions
      brcm80211: moved function brcmu_chipname
      brcm80211: moved function brcmu_parse_tlvs
      brcm80211: moved function brcmu_chspec_malformed
      brcm80211: moved function brcmu_mkiovar
      brcm80211: moved function brcmu_format_flags
      brcm80211: removed file wifi.c

Amitkumar Karwar (3):
      mwifiex: add support for Marvell pcie8766 chipset
      mwifiex: use separate wait condition for each command node
      mwifiex: fix make namespacecheck warnings

Arend van Spriel (11):
      net: wireless: add brcm80211 drivers
      brcm80211: remove sparse warning in fullmac debug function
      brcm80211: fix sparse endianess error in mac80211_if.c
      brcm80211: add endian annotation to packet filter structures
      brcm80211: rename variable in _brcmf_set_multicast_list()
      brcm80211: fix annotations in TOE configuration functions
      brcm80211: use endian annotations in scan related function
      brcm80211: use endian annotation for pmk related structure
      brcm80211: use endian annotations for assoc ie length request
      brcm80211: use endian annotation for roaming related parameters
      brcm80211: use endian annotation for scan time configuration

Chaoming Li (4):
      rtlwifi: Update to new Realtek version - Part I
      rtlwifi: rtl8192ce: Add new chip revisions
      rtlwifi: rtl8192se: Updates from latest Realtek driver version - Part II
      rtlwifi: rtl8192de: Updates from latest Reaktek driver - Part III

Dan Carpenter (3):
      ath5k: remove some unneeded error handling code
      ath9k: remove some bogus error handling code
      iwmc3200wifi: add a range check to iwm_cfg80211_get_key()

Daniel Drake (1):
      libertas: fix changing interface type when interface is down

Don Fry (1):
      iwlagn: eliminate bus pointer from iwl_priv structure

Eliad Peller (2):
      wl12xx: configure rate policy for p2p operations
      wl12xx: disable AP-mode-specific quirks

Emmanuel Grumbach (7):
      iwlagn: kill hw_params.max_stations
      iwlagn: fix a race in the unmapping of the TFDs
      iwlagn: warn only once if AGG state is wrong
      iwlagn: move iwl_beacon_time_mask_XXX near to usage
      iwlagn: move iwl_enable_rfkill_int and kill iwl-helpers.h
      iwlagn: remove uneeded include to iwl-dev.h
      iwlagn: add missing include to iwl-agn-rs.h

Felix Fietkau (11):
      ath9k: indicate which queues are blocked when stopping tx fails
      ath9k: keep track of what's triggering hardware resets
      ath9k: improve PS filter clearing and retry counting for A-MPDU
      ath9k: fix retry counting / BAR handling during queue flush
      ath9k: disable unnecessary PHY error reporting
      ath9k_hw: make ath9k_hw_set_interrupts use ah->imask by default
      ath9k_hw: clean up tx power handling
      ath: remove ath_regulatory::current_rd_ext
      ath9k_hw: remove EEP_REG_1
      ath9k_hw: fix a regression in key miss handling
      ath9k: only send FCS-fail packets to mac80211 if requested

Helmut Schaa (5):
      mac80211: Update injection documentation
      mac80211: Build TX radiotap header dynamically
      mac80211: Populate radiotap header with MCS info for TX frames
      nl80211: Add sta_flags to the station info
      mac80211: Provide station flags to cfg80211

Javier Cardona (1):
      mac80211: Fix regression that allowed mpaths between non-peers.

Johannes Berg (16):
      mac80211: pass no-CCK flag through to HW scan
      mac80211: fix offchannel TX cookie matching
      mac80211: optimise monitor xmit
      mac80211: remove tx_data ethertype
      mac80211: move fragment flag to info flag as dont-fragment
      mac80211: parse radiotap header earlier
      mac80211: dont adjust truesize
      mac80211: dont orphan TX skb
      iwlagn: update beacon smarter
      iwlagn: don't assign seqno to QoS Null frames
      iwlagn: send simple LQ command for WoWLAN
      iwlagn: stop interrupts when suspending
      iwlagn: remove 5000 hw header
      iwlagn: remove 6000 hw header
      mac80211: reformat TX unauthorised check
      mac80211: fix TID for null poll response

John W. Linville (2):
      Merge branch 'for-linville' of git://github.com/lucacoelho/wl12xx
      Merge branch 'master' of git://git.infradead.org/users/linville/wireless-next into for-davem

Larry Finger (2):
      rtlwifi: Change debug parameter to apply to individual drivers
      rtlwifi: Change PCI drivers to use the new PM framework

Luciano Coelho (1):
      wl12xx: set max_sched_scan_ie_len correctly

Rafał Miłecki (3):
      b43: trivial: do not report any link quality instead of invalid one
      Revert "b43: trivial: do not report any link quality instead of invalid one"
      b43: N-PHY: report signal to mac80211

Rajkumar Manoharan (14):
      ath9k_hw: Fix ASPM L1 issue for AR9480
      ath9k_hw: Updated ar9003 initval table for AR9380
      ath9k_hw: Update AR9003 initval to improve phase noise
      ath9k_hw: Updated AR9003 tx gain table for 5GHz
      ath9k_hw: Improve fast channel change for AR9003 chips
      ath9k_hw: Add support to reuse TxIQ cal measurements
      ath9k_hw: Add support to reuse Carrier leak calibration
      ath9k_hw: Cleanup Tx calibrations for AR9003 chips
      ath9k_hw: Support fast channel change on 5GHz for AR9003 chips
      ath9k_hw: Update normal/min noise floor value for AR9480
      ath9k_hw: Add radio retention support for AR9480
      ath9k_hw: Do fast channel change based on reusable calibration results
      ath9k_hw: Rename AR9480 -> AR9462 initvals
      ath9k: Rename AR9480 into AR9462

Roland Vossen (3):
      brcm80211: smac: removed redundant timer function parameters
      brcm80211: smac: decreased timer callback irq level
      brcm80211: fmac: fixed weird indentation

Shahar Levi (1):
      wl12xx: Add support for HW channel switch

Stanislaw Gruszka (1):
      iwlagn: fix priv->cfg->ht_params NULL pointer dereference

Stephen Rothwell (2):
      net: wireless: brcm80211: replace ndo_set_multicast_list  with ndo_set_rx_mode
      net: wireless: brcm80210: include module.h

Wey-Yi Guy (20):
      iwlagn: separate init calib and rt calib
      iwlagn: add cmd queue pointer info when timeout
      iwlagn: add REPLY_ECHO host command
      iwlagn: add WARN if tx cmd complete come back late
      iwlagn: add "echo" test when command queue stuck
      iwlagn: check rf kill in queue stuck
      iwlagn: add "echo test" command to debugfs
      iwlagn: remove un-necessary step
      iwlagn: set rts retry limit
      iwlagn: add "_d" sku to 6005 series of devices
      iwlagn: Add "_d" sku to 105 series of devices
      iwlagn: do nothing when disable agg in wrong state
      iwlagn: use low retry limit for WoWLAN
      iwlwifi: update comments on how to enable debug flag
      iwlagn: more info on warning for shutdown agg queue
      iwlagn: don't stop rts/cts until last aggregation queue close
      iwlagn: add debug for mac80211 callback
      iwlagn: rename all the mac80211 callback functions
      iwlagn: merge station management functions
      iwlagn: rename iwl-rx.c to iwl-agn-rx.c

Yogesh Ashok Powar (1):
      mwifiex: fix smatch errors

 Documentation/networking/mac80211-injection.txt    |    4 +
 drivers/net/wireless/Kconfig                       |    1 +
 drivers/net/wireless/Makefile                      |    3 +
 drivers/net/wireless/ath/ath.h                     |    2 -
 drivers/net/wireless/ath/ath5k/base.c              |    6 -
 drivers/net/wireless/ath/ath9k/Makefile            |    1 +
 drivers/net/wireless/ath/ath9k/ani.c               |    5 -
 drivers/net/wireless/ath/ath9k/ar5008_phy.c        |   11 +-
 .../net/wireless/ath/ath9k/ar9003_2p2_initvals.h   |  172 +-
 drivers/net/wireless/ath/ath9k/ar9003_calib.c      |  250 +-
 drivers/net/wireless/ath/ath9k/ar9003_eeprom.c     |   59 +-
 drivers/net/wireless/ath/ath9k/ar9003_hw.c         |  186 +-
 drivers/net/wireless/ath/ath9k/ar9003_mac.c        |    4 +-
 drivers/net/wireless/ath/ath9k/ar9003_paprd.c      |   15 +-
 drivers/net/wireless/ath/ath9k/ar9003_phy.c        |   97 +-
 drivers/net/wireless/ath/ath9k/ar9003_phy.h        |   52 +-
 drivers/net/wireless/ath/ath9k/ar9003_rtt.c        |  153 +
 drivers/net/wireless/ath/ath9k/ar9003_rtt.h        |   28 +
 ...ar9480_1p0_initvals.h => ar9462_1p0_initvals.h} |   62 +-
 ...ar9480_2p0_initvals.h => ar9462_2p0_initvals.h} |   68 +-
 drivers/net/wireless/ath/ath9k/ath9k.h             |    2 +-
 drivers/net/wireless/ath/ath9k/beacon.c            |   10 +-
 drivers/net/wireless/ath/ath9k/common.c            |    6 +-
 drivers/net/wireless/ath/ath9k/debug.c             |   19 +-
 drivers/net/wireless/ath/ath9k/debug.h             |   13 +
 drivers/net/wireless/ath/ath9k/eeprom.h            |   10 +-
 drivers/net/wireless/ath/ath9k/eeprom_4k.c         |   29 +-
 drivers/net/wireless/ath/ath9k/eeprom_9287.c       |   35 +-
 drivers/net/wireless/ath/ath9k/eeprom_def.c        |   45 +-
 drivers/net/wireless/ath/ath9k/gpio.c              |    8 +-
 drivers/net/wireless/ath/ath9k/hw-ops.h            |    7 +
 drivers/net/wireless/ath/ath9k/hw.c                |  158 +-
 drivers/net/wireless/ath/ath9k/hw.h                |   39 +-
 drivers/net/wireless/ath/ath9k/init.c              |    2 -
 drivers/net/wireless/ath/ath9k/mac.c               |   10 +-
 drivers/net/wireless/ath/ath9k/mac.h               |    6 +-
 drivers/net/wireless/ath/ath9k/main.c              |   25 +-
 drivers/net/wireless/ath/ath9k/pci.c               |    2 +-
 drivers/net/wireless/ath/ath9k/recv.c              |   35 +-
 drivers/net/wireless/ath/ath9k/reg.h               |   29 +-
 drivers/net/wireless/ath/ath9k/xmit.c              |   40 +-
 drivers/net/wireless/ath/carl9170/main.c           |    1 -
 drivers/net/wireless/b43/xmit.c                    |   18 +-
 drivers/net/wireless/b43/xmit.h                    |   10 +-
 drivers/net/wireless/brcm80211/Kconfig             |   35 +
 drivers/net/wireless/brcm80211/Makefile            |   23 +
 drivers/net/wireless/brcm80211/brcmfmac/Makefile   |   33 +
 drivers/net/wireless/brcm80211/brcmfmac/bcmchip.h  |   32 +
 drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c   |  371 +
 .../net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c |  626 +
 drivers/net/wireless/brcm80211/brcmfmac/dhd.h      |  776 +
 drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h  |   57 +
 drivers/net/wireless/brcm80211/brcmfmac/dhd_cdc.c  |  498 +
 .../net/wireless/brcm80211/brcmfmac/dhd_common.c   |  895 +
 drivers/net/wireless/brcm80211/brcmfmac/dhd_dbg.h  |   58 +
 .../net/wireless/brcm80211/brcmfmac/dhd_linux.c    | 1356 +
 .../net/wireless/brcm80211/brcmfmac/dhd_proto.h    |   60 +
 drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c | 4591 ++++
 .../net/wireless/brcm80211/brcmfmac/sdio_host.h    |  252 +
 .../net/wireless/brcm80211/brcmfmac/wl_cfg80211.c  | 3868 +++
 .../net/wireless/brcm80211/brcmfmac/wl_cfg80211.h  |  375 +
 drivers/net/wireless/brcm80211/brcmsmac/Makefile   |   51 +
 drivers/net/wireless/brcm80211/brcmsmac/aiutils.c  | 2079 ++
 drivers/net/wireless/brcm80211/brcmsmac/aiutils.h  |  378 +
 drivers/net/wireless/brcm80211/brcmsmac/ampdu.c    | 1241 +
 drivers/net/wireless/brcm80211/brcmsmac/ampdu.h    |   30 +
 drivers/net/wireless/brcm80211/brcmsmac/antsel.c   |  307 +
 drivers/net/wireless/brcm80211/brcmsmac/antsel.h   |   29 +
 .../brcm80211/brcmsmac/brcms_trace_events.c        |   23 +
 .../brcm80211/brcmsmac/brcms_trace_events.h        |   92 +
 drivers/net/wireless/brcm80211/brcmsmac/channel.c  | 1591 ++
 drivers/net/wireless/brcm80211/brcmsmac/channel.h  |   53 +
 drivers/net/wireless/brcm80211/brcmsmac/d11.h      | 1898 ++
 drivers/net/wireless/brcm80211/brcmsmac/dma.c      | 1425 +
 drivers/net/wireless/brcm80211/brcmsmac/dma.h      |  120 +
 .../net/wireless/brcm80211/brcmsmac/mac80211_if.c  | 1696 ++
 .../net/wireless/brcm80211/brcmsmac/mac80211_if.h  |  108 +
 drivers/net/wireless/brcm80211/brcmsmac/main.c     | 8775 ++++++
 drivers/net/wireless/brcm80211/brcmsmac/main.h     |  735 +
 drivers/net/wireless/brcm80211/brcmsmac/nicpci.c   |  835 +
 drivers/net/wireless/brcm80211/brcmsmac/nicpci.h   |   82 +
 drivers/net/wireless/brcm80211/brcmsmac/otp.c      |  426 +
 drivers/net/wireless/brcm80211/brcmsmac/otp.h      |   36 +
 .../net/wireless/brcm80211/brcmsmac/phy/phy_cmn.c  | 2988 ++
 .../net/wireless/brcm80211/brcmsmac/phy/phy_hal.h  |  301 +
 .../net/wireless/brcm80211/brcmsmac/phy/phy_int.h  | 1169 +
 .../net/wireless/brcm80211/brcmsmac/phy/phy_lcn.c  | 5154 ++++
 .../net/wireless/brcm80211/brcmsmac/phy/phy_lcn.h  |  121 +
 .../net/wireless/brcm80211/brcmsmac/phy/phy_n.c    |28876 ++++++++++++++++++++
 .../wireless/brcm80211/brcmsmac/phy/phy_qmath.c    |  308 +
 .../wireless/brcm80211/brcmsmac/phy/phy_qmath.h    |   42 +
 .../wireless/brcm80211/brcmsmac/phy/phy_radio.h    | 1533 ++
 .../net/wireless/brcm80211/brcmsmac/phy/phyreg_n.h |  167 +
 .../wireless/brcm80211/brcmsmac/phy/phytbl_lcn.c   | 3250 +++
 .../wireless/brcm80211/brcmsmac/phy/phytbl_lcn.h   |   54 +
 .../net/wireless/brcm80211/brcmsmac/phy/phytbl_n.c |10630 +++++++
 .../net/wireless/brcm80211/brcmsmac/phy/phytbl_n.h |   50 +
 drivers/net/wireless/brcm80211/brcmsmac/phy_shim.c |  225 +
 drivers/net/wireless/brcm80211/brcmsmac/phy_shim.h |  182 +
 drivers/net/wireless/brcm80211/brcmsmac/pmu.c      |  458 +
 drivers/net/wireless/brcm80211/brcmsmac/pmu.h      |   38 +
 drivers/net/wireless/brcm80211/brcmsmac/pub.h      |  634 +
 drivers/net/wireless/brcm80211/brcmsmac/rate.c     |  514 +
 drivers/net/wireless/brcm80211/brcmsmac/rate.h     |  250 +
 drivers/net/wireless/brcm80211/brcmsmac/scb.h      |   82 +
 drivers/net/wireless/brcm80211/brcmsmac/srom.c     | 1298 +
 drivers/net/wireless/brcm80211/brcmsmac/srom.h     |   34 +
 drivers/net/wireless/brcm80211/brcmsmac/stf.c      |  436 +
 drivers/net/wireless/brcm80211/brcmsmac/stf.h      |   42 +
 drivers/net/wireless/brcm80211/brcmsmac/types.h    |  352 +
 .../net/wireless/brcm80211/brcmsmac/ucode_loader.c |  109 +
 .../net/wireless/brcm80211/brcmsmac/ucode_loader.h |   58 +
 drivers/net/wireless/brcm80211/brcmutil/Makefile   |   28 +
 drivers/net/wireless/brcm80211/brcmutil/utils.c    |  386 +
 .../net/wireless/brcm80211/include/brcm_hw_ids.h   |   59 +
 .../net/wireless/brcm80211/include/brcmu_utils.h   |  195 +
 .../net/wireless/brcm80211/include/brcmu_wifi.h    |  239 +
 .../net/wireless/brcm80211/include/chipcommon.h    |  284 +
 drivers/net/wireless/brcm80211/include/defs.h      |  104 +
 drivers/net/wireless/brcm80211/include/soc.h       |   90 +
 drivers/net/wireless/iwlwifi/Kconfig               |    4 +-
 drivers/net/wireless/iwlwifi/Makefile              |    3 +-
 drivers/net/wireless/iwlwifi/iwl-1000.c            |    3 -
 drivers/net/wireless/iwlwifi/iwl-2000.c            |   10 +-
 drivers/net/wireless/iwlwifi/iwl-5000-hw.h         |   88 -
 drivers/net/wireless/iwlwifi/iwl-5000.c            |   22 +-
 drivers/net/wireless/iwlwifi/iwl-6000-hw.h         |   81 -
 drivers/net/wireless/iwlwifi/iwl-6000.c            |   12 +-
 drivers/net/wireless/iwlwifi/iwl-agn-hw.h          |   15 +-
 drivers/net/wireless/iwlwifi/iwl-agn-lib.c         |    2 -
 drivers/net/wireless/iwlwifi/iwl-agn-rs.c          |    4 +-
 drivers/net/wireless/iwlwifi/iwl-agn-rs.h          |    4 +
 .../wireless/iwlwifi/{iwl-rx.c => iwl-agn-rx.c}    |  112 +-
 drivers/net/wireless/iwlwifi/iwl-agn-rxon.c        |   10 +-
 drivers/net/wireless/iwlwifi/iwl-agn-sta.c         |  861 +-
 drivers/net/wireless/iwlwifi/iwl-agn-tx.c          |   32 +-
 drivers/net/wireless/iwlwifi/iwl-agn-ucode.c       |    1 -
 drivers/net/wireless/iwlwifi/iwl-agn.c             |  126 +-
 drivers/net/wireless/iwlwifi/iwl-agn.h             |  131 +-
 drivers/net/wireless/iwlwifi/iwl-cfg.h             |    2 +
 drivers/net/wireless/iwlwifi/iwl-commands.h        |   11 +
 drivers/net/wireless/iwlwifi/iwl-core.c            |   83 +-
 drivers/net/wireless/iwlwifi/iwl-core.h            |   20 +-
 drivers/net/wireless/iwlwifi/iwl-debug.h           |    8 +-
 drivers/net/wireless/iwlwifi/iwl-debugfs.c         |   22 +-
 drivers/net/wireless/iwlwifi/iwl-dev.h             |    3 -
 drivers/net/wireless/iwlwifi/iwl-helpers.h         |   72 -
 drivers/net/wireless/iwlwifi/iwl-led.c             |    3 +-
 drivers/net/wireless/iwlwifi/iwl-pci.c             |    2 +
 drivers/net/wireless/iwlwifi/iwl-power.c           |    2 +-
 drivers/net/wireless/iwlwifi/iwl-scan.c            |    4 +-
 drivers/net/wireless/iwlwifi/iwl-shared.h          |    2 -
 drivers/net/wireless/iwlwifi/iwl-sta.c             |  835 -
 drivers/net/wireless/iwlwifi/iwl-sta.h             |  141 -
 drivers/net/wireless/iwlwifi/iwl-sv-open.c         |    8 +-
 drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c   |    1 -
 drivers/net/wireless/iwlwifi/iwl-trans-pcie-tx.c   |   23 +-
 drivers/net/wireless/iwlwifi/iwl-trans-pcie.c      |   21 +-
 drivers/net/wireless/iwmc3200wifi/cfg80211.c       |    6 +-
 drivers/net/wireless/libertas/cfg.c                |   20 +-
 drivers/net/wireless/libertas/decl.h               |    2 +
 drivers/net/wireless/libertas/main.c               |   32 +
 drivers/net/wireless/mwifiex/11n_aggr.c            |    3 +-
 drivers/net/wireless/mwifiex/Kconfig               |   11 +
 drivers/net/wireless/mwifiex/Makefile              |    3 +
 drivers/net/wireless/mwifiex/cfp.c                 |   10 +-
 drivers/net/wireless/mwifiex/cmdevt.c              |   34 +-
 drivers/net/wireless/mwifiex/decl.h                |    1 -
 drivers/net/wireless/mwifiex/fw.h                  |   36 +-
 drivers/net/wireless/mwifiex/init.c                |   73 +-
 drivers/net/wireless/mwifiex/main.c                |   10 +-
 drivers/net/wireless/mwifiex/main.h                |   35 +-
 drivers/net/wireless/mwifiex/pcie.c                | 1948 ++
 drivers/net/wireless/mwifiex/pcie.h                |  148 +
 drivers/net/wireless/mwifiex/scan.c                |   56 +-
 drivers/net/wireless/mwifiex/sdio.c                |   19 +-
 drivers/net/wireless/mwifiex/sdio.h                |   24 +-
 drivers/net/wireless/mwifiex/sta_cmd.c             |   64 +
 drivers/net/wireless/mwifiex/sta_cmdresp.c         |    2 +
 drivers/net/wireless/mwifiex/sta_ioctl.c           |   12 +-
 drivers/net/wireless/mwifiex/sta_tx.c              |    2 +-
 drivers/net/wireless/mwifiex/txrx.c                |   45 +-
 drivers/net/wireless/mwifiex/util.c                |    5 +-
 drivers/net/wireless/mwifiex/util.h                |    9 +-
 drivers/net/wireless/mwifiex/wmm.c                 |    4 +-
 drivers/net/wireless/rtlwifi/base.c                |    6 +-
 drivers/net/wireless/rtlwifi/debug.c               |    6 -
 drivers/net/wireless/rtlwifi/pci.c                 |   19 +-
 drivers/net/wireless/rtlwifi/pci.h                 |    4 +-
 drivers/net/wireless/rtlwifi/rtl8192ce/def.h       |   14 +
 drivers/net/wireless/rtlwifi/rtl8192ce/sw.c        |   35 +-
 drivers/net/wireless/rtlwifi/rtl8192cu/def.h       |    4 -
 drivers/net/wireless/rtlwifi/rtl8192cu/sw.c        |    7 +
 drivers/net/wireless/rtlwifi/rtl8192de/def.h       |  135 +-
 drivers/net/wireless/rtlwifi/rtl8192de/hw.c        |   15 +-
 drivers/net/wireless/rtlwifi/rtl8192de/sw.c        |   21 +-
 drivers/net/wireless/rtlwifi/rtl8192se/hw.c        |   22 +-
 drivers/net/wireless/rtlwifi/rtl8192se/reg.h       |    1 +
 drivers/net/wireless/rtlwifi/rtl8192se/sw.c        |   22 +-
 drivers/net/wireless/rtlwifi/rtl8192se/trx.c       |   55 +-
 drivers/net/wireless/rtlwifi/wifi.h                |    5 +
 drivers/net/wireless/wl12xx/acx.c                  |   16 +
 drivers/net/wireless/wl12xx/acx.h                  |    1 +
 drivers/net/wireless/wl12xx/boot.c                 |    6 +-
 drivers/net/wireless/wl12xx/cmd.c                  |   63 +-
 drivers/net/wireless/wl12xx/cmd.h                  |   20 +
 drivers/net/wireless/wl12xx/conf.h                 |    6 +-
 drivers/net/wireless/wl12xx/event.c                |   15 +
 drivers/net/wireless/wl12xx/main.c                 |   48 +-
 drivers/net/wireless/wl12xx/wl12xx.h               |    7 +-
 drivers/staging/Kconfig                            |    2 +-
 drivers/staging/Makefile                           |    4 +-
 include/linux/nl80211.h                            |    2 +
 include/net/cfg80211.h                             |    5 +-
 include/net/mac80211.h                             |   10 +-
 net/mac80211/cfg.c                                 |   22 +-
 net/mac80211/ieee80211_i.h                         |   15 +-
 net/mac80211/main.c                                |    6 +-
 net/mac80211/mesh_hwmp.c                           |    9 +
 net/mac80211/scan.c                                |    1 +
 net/mac80211/sta_info.c                            |    6 +-
 net/mac80211/status.c                              |  137 +-
 net/mac80211/tx.c                                  |  360 +-
 net/mac80211/work.c                                |    2 +-
 net/mac80211/wpa.c                                 |    3 +-
 net/wireless/nl80211.c                             |    4 +
 226 files changed, 102247 insertions(+), 2686 deletions(-)
 create mode 100644 drivers/net/wireless/ath/ath9k/ar9003_rtt.c
 create mode 100644 drivers/net/wireless/ath/ath9k/ar9003_rtt.h
 rename drivers/net/wireless/ath/ath9k/{ar9480_1p0_initvals.h => ar9462_1p0_initvals.h} (97%)
 rename drivers/net/wireless/ath/ath9k/{ar9480_2p0_initvals.h => ar9462_2p0_initvals.h} (97%)
 create mode 100644 drivers/net/wireless/brcm80211/Kconfig
 create mode 100644 drivers/net/wireless/brcm80211/Makefile
 create mode 100644 drivers/net/wireless/brcm80211/brcmfmac/Makefile
 create mode 100644 drivers/net/wireless/brcm80211/brcmfmac/bcmchip.h
 create mode 100644 drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c
 create mode 100644 drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c
 create mode 100644 drivers/net/wireless/brcm80211/brcmfmac/dhd.h
 create mode 100644 drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h
 create mode 100644 drivers/net/wireless/brcm80211/brcmfmac/dhd_cdc.c
 create mode 100644 drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c
 create mode 100644 drivers/net/wireless/brcm80211/brcmfmac/dhd_dbg.h
 create mode 100644 drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c
 create mode 100644 drivers/net/wireless/brcm80211/brcmfmac/dhd_proto.h
 create mode 100644 drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c
 create mode 100644 drivers/net/wireless/brcm80211/brcmfmac/sdio_host.h
 create mode 100644 drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
 create mode 100644 drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.h
 create mode 100644 drivers/net/wireless/brcm80211/brcmsmac/Makefile
 create mode 100644 drivers/net/wireless/brcm80211/brcmsmac/aiutils.c
 create mode 100644 drivers/net/wireless/brcm80211/brcmsmac/aiutils.h
 create mode 100644 drivers/net/wireless/brcm80211/brcmsmac/ampdu.c
 create mode 100644 drivers/net/wireless/brcm80211/brcmsmac/ampdu.h
 create mode 100644 drivers/net/wireless/brcm80211/brcmsmac/antsel.c
 create mode 100644 drivers/net/wireless/brcm80211/brcmsmac/antsel.h
 create mode 100644 drivers/net/wireless/brcm80211/brcmsmac/brcms_trace_events.c
 create mode 100644 drivers/net/wireless/brcm80211/brcmsmac/brcms_trace_events.h
 create mode 100644 drivers/net/wireless/brcm80211/brcmsmac/channel.c
 create mode 100644 drivers/net/wireless/brcm80211/brcmsmac/channel.h
 create mode 100644 drivers/net/wireless/brcm80211/brcmsmac/d11.h
 create mode 100644 drivers/net/wireless/brcm80211/brcmsmac/dma.c
 create mode 100644 drivers/net/wireless/brcm80211/brcmsmac/dma.h
 create mode 100644 drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
 create mode 100644 drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.h
 create mode 100644 drivers/net/wireless/brcm80211/brcmsmac/main.c
 create mode 100644 drivers/net/wireless/brcm80211/brcmsmac/main.h
 create mode 100644 drivers/net/wireless/brcm80211/brcmsmac/nicpci.c
 create mode 100644 drivers/net/wireless/brcm80211/brcmsmac/nicpci.h
 create mode 100644 drivers/net/wireless/brcm80211/brcmsmac/otp.c
 create mode 100644 drivers/net/wireless/brcm80211/brcmsmac/otp.h
 create mode 100644 drivers/net/wireless/brcm80211/brcmsmac/phy/phy_cmn.c
 create mode 100644 drivers/net/wireless/brcm80211/brcmsmac/phy/phy_hal.h
 create mode 100644 drivers/net/wireless/brcm80211/brcmsmac/phy/phy_int.h
 create mode 100644 drivers/net/wireless/brcm80211/brcmsmac/phy/phy_lcn.c
 create mode 100644 drivers/net/wireless/brcm80211/brcmsmac/phy/phy_lcn.h
 create mode 100644 drivers/net/wireless/brcm80211/brcmsmac/phy/phy_n.c
 create mode 100644 drivers/net/wireless/brcm80211/brcmsmac/phy/phy_qmath.c
 create mode 100644 drivers/net/wireless/brcm80211/brcmsmac/phy/phy_qmath.h
 create mode 100644 drivers/net/wireless/brcm80211/brcmsmac/phy/phy_radio.h
 create mode 100644 drivers/net/wireless/brcm80211/brcmsmac/phy/phyreg_n.h
 create mode 100644 drivers/net/wireless/brcm80211/brcmsmac/phy/phytbl_lcn.c
 create mode 100644 drivers/net/wireless/brcm80211/brcmsmac/phy/phytbl_lcn.h
 create mode 100644 drivers/net/wireless/brcm80211/brcmsmac/phy/phytbl_n.c
 create mode 100644 drivers/net/wireless/brcm80211/brcmsmac/phy/phytbl_n.h
 create mode 100644 drivers/net/wireless/brcm80211/brcmsmac/phy_shim.c
 create mode 100644 drivers/net/wireless/brcm80211/brcmsmac/phy_shim.h
 create mode 100644 drivers/net/wireless/brcm80211/brcmsmac/pmu.c
 create mode 100644 drivers/net/wireless/brcm80211/brcmsmac/pmu.h
 create mode 100644 drivers/net/wireless/brcm80211/brcmsmac/pub.h
 create mode 100644 drivers/net/wireless/brcm80211/brcmsmac/rate.c
 create mode 100644 drivers/net/wireless/brcm80211/brcmsmac/rate.h
 create mode 100644 drivers/net/wireless/brcm80211/brcmsmac/scb.h
 create mode 100644 drivers/net/wireless/brcm80211/brcmsmac/srom.c
 create mode 100644 drivers/net/wireless/brcm80211/brcmsmac/srom.h
 create mode 100644 drivers/net/wireless/brcm80211/brcmsmac/stf.c
 create mode 100644 drivers/net/wireless/brcm80211/brcmsmac/stf.h
 create mode 100644 drivers/net/wireless/brcm80211/brcmsmac/types.h
 create mode 100644 drivers/net/wireless/brcm80211/brcmsmac/ucode_loader.c
 create mode 100644 drivers/net/wireless/brcm80211/brcmsmac/ucode_loader.h
 create mode 100644 drivers/net/wireless/brcm80211/brcmutil/Makefile
 create mode 100644 drivers/net/wireless/brcm80211/brcmutil/utils.c
 create mode 100644 drivers/net/wireless/brcm80211/include/brcm_hw_ids.h
 create mode 100644 drivers/net/wireless/brcm80211/include/brcmu_utils.h
 create mode 100644 drivers/net/wireless/brcm80211/include/brcmu_wifi.h
 create mode 100644 drivers/net/wireless/brcm80211/include/chipcommon.h
 create mode 100644 drivers/net/wireless/brcm80211/include/defs.h
 create mode 100644 drivers/net/wireless/brcm80211/include/soc.h
 delete mode 100644 drivers/net/wireless/iwlwifi/iwl-5000-hw.h
 delete mode 100644 drivers/net/wireless/iwlwifi/iwl-6000-hw.h
 rename drivers/net/wireless/iwlwifi/{iwl-rx.c => iwl-agn-rx.c} (91%)
 delete mode 100644 drivers/net/wireless/iwlwifi/iwl-helpers.h
 delete mode 100644 drivers/net/wireless/iwlwifi/iwl-sta.c
 delete mode 100644 drivers/net/wireless/iwlwifi/iwl-sta.h
 create mode 100644 drivers/net/wireless/mwifiex/pcie.c
 create mode 100644 drivers/net/wireless/mwifiex/pcie.h
-- 
John W. Linville		Someday the world will need a hero, and you
linville-2XuSBdqkA4R54TAoqtyWWQ@public.gmane.org			might be all we have.  Be ready.
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

^ permalink raw reply

* bridge: allow forwarding LLDP frames
From: Ed Swierk @ 2011-10-17 18:12 UTC (permalink / raw)
  To: shemminger, davem, netdev, eswierk

LLDP frames have reserved destination MAC address 01-80-C2-00-00-0E,
which by default are not forwarded by 802.1d-compliant bridges.

In certain situations, like when creating a transparent link-layer
relay between a pair of interfaces, it may be useful to configure a
bridge interface to forward LLDP and other control frames in the
01-80-C2-00-00-xx range rather than filtering them.

Stephen Hemminger's recent patch allows the user to set a sysfs
attribute /sys/class/net/brX/bridge/group_fwd_mask to enable
forwarding of normally filtered addresses, with certain exceptions.
This patch eliminates the restriction on LLDP frames, allowing the
user to override the default behavior of filtering them.

Signed-off-by: Ed Swierk <eswierk@bigswitch.com>

---

diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h
index a248fe6..b016dd8 100644
--- a/net/bridge/br_private.h
+++ b/net/bridge/br_private.h
@@ -31,8 +31,8 @@
 
 /* Control of forwarding link local multicast */
 #define BR_GROUPFWD_DEFAULT	0
-/* Don't allow forwarding control protocols like STP and LLDP */
-#define BR_GROUPFWD_RESTRICTED	0x4007u
+/* Don't allow forwarding control protocols like STP */
+#define BR_GROUPFWD_RESTRICTED	0x0007u
 
 /* Path to usermode spanning tree program */
 #define BR_STP_PROG	"/sbin/bridge-stp"

^ permalink raw reply related

* realtek 8168 driver problem
From: HacKurx @ 2011-10-17 18:13 UTC (permalink / raw)
  To: netdev

Hi,

A very annoying problem affects a large number of GNU/Linux distribution.
Network card problem (with 8111/8168 chipset), As you can see:

https://bugs.launchpad.net/ubuntu/+source/linux/+bug/839393
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=627704#84
http://forums.linuxmint.com/viewtopic.php?f=49&t=80757
https://aur.archlinux.org/packages.php?ID=27000

Can you fix it?

Thank you, best regards

Loic (HacKurx).

^ permalink raw reply

* RE: [net-next 6/6] ixgbe: change the eeprom version reported by ethtool
From: Tantilov, Emil S @ 2011-10-17 18:02 UTC (permalink / raw)
  To: Ben Hutchings, Joe Perches
  Cc: Kirsher, Jeffrey T, davem@davemloft.net, netdev@vger.kernel.org,
	gospo@redhat.com, sassmann@redhat.com
In-Reply-To: <1318871797.2784.36.camel@bwh-desktop>

>-----Original Message-----
>From: Ben Hutchings [mailto:bhutchings@solarflare.com]
>Sent: Monday, October 17, 2011 10:17 AM
>To: Joe Perches
>Cc: Kirsher, Jeffrey T; davem@davemloft.net; Tantilov, Emil S;
>netdev@vger.kernel.org; gospo@redhat.com; sassmann@redhat.com
>Subject: Re: [net-next 6/6] ixgbe: change the eeprom version reported by
>ethtool
>
>On Mon, 2011-10-17 at 08:57 -0700, Joe Perches wrote:
>> On Mon, 2011-10-17 at 05:21 -0700, Jeff Kirsher wrote:
>> > From: Emil Tantilov <emil.s.tantilov@intel.com>
>> >
>> > Use 32bit value starting at offset 0x2d for displaying the firmware
>> > version in ethtool. This should work for all current ixgbe HW
>> []
>> > diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c
>b/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c
>> []
>> > -	snprintf(firmware_version, sizeof(firmware_version), "%d.%d-%d",
>> > -	         (adapter->eeprom_version & 0xF000) >> 12,
>> > -	         (adapter->eeprom_version & 0x0FF0) >> 4,
>> > -	         adapter->eeprom_version & 0x000F);
>> > +	nvm_track_id = (adapter->eeprom_verh << 16) |
>> > +			adapter->eeprom_verl;
>> > +	snprintf(firmware_version, sizeof(firmware_version), "0x%08x",
>> > +		 nvm_track_id);
>>
>> Is ethtool output like proc output considered an abi
>> that should not be changed?
>
>No-one should make any assumptions about the format of firmware_version
>strings.  However they ought to be consistent with vendor documentation,
>update programs, etc.

The old value was only marginally useful as it was possible to have different 
images with the same version. The 32 bit value shown by this patch is what 
is being used by the FW team to record the revisions of the images.

The words used to hold the 32 bit value are not described in the datasheet
for 82598/9, but will be in X540 once it becomes available and I have requested that this information be added to the 82598/9 docs as well.

Thanks,
Emil

>
>Ben.
>
>--
>Ben Hutchings, Staff Engineer, Solarflare
>Not speaking for my employer; that's the marketing department's job.
>They asked us to note that Solarflare product names are trademarked.


^ permalink raw reply

* Re: [net-next 6/6] ixgbe: change the eeprom version reported by ethtool
From: Ben Hutchings @ 2011-10-17 17:16 UTC (permalink / raw)
  To: Joe Perches; +Cc: Jeff Kirsher, davem, Emil Tantilov, netdev, gospo, sassmann
In-Reply-To: <1318867035.5407.5.camel@Joe-Laptop>

On Mon, 2011-10-17 at 08:57 -0700, Joe Perches wrote:
> On Mon, 2011-10-17 at 05:21 -0700, Jeff Kirsher wrote:
> > From: Emil Tantilov <emil.s.tantilov@intel.com>
> > 
> > Use 32bit value starting at offset 0x2d for displaying the firmware
> > version in ethtool. This should work for all current ixgbe HW
> []
> > diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c
> []
> > -	snprintf(firmware_version, sizeof(firmware_version), "%d.%d-%d",
> > -	         (adapter->eeprom_version & 0xF000) >> 12,
> > -	         (adapter->eeprom_version & 0x0FF0) >> 4,
> > -	         adapter->eeprom_version & 0x000F);
> > +	nvm_track_id = (adapter->eeprom_verh << 16) |
> > +			adapter->eeprom_verl;
> > +	snprintf(firmware_version, sizeof(firmware_version), "0x%08x",
> > +		 nvm_track_id);
> 
> Is ethtool output like proc output considered an abi
> that should not be changed?

No-one should make any assumptions about the format of firmware_version
strings.  However they ought to be consistent with vendor documentation,
update programs, etc.

Ben.

-- 
Ben Hutchings, Staff Engineer, Solarflare
Not speaking for my employer; that's the marketing department's job.
They asked us to note that Solarflare product names are trademarked.

^ permalink raw reply

* Re: [PATCH] iproute2: update CAN bitrate SJW help text
From: Oliver Hartkopp @ 2011-10-17 17:02 UTC (permalink / raw)
  To: Stephen Hemminger; +Cc: Wolfgang Grandegger, Linux Netdev List, linux-can
In-Reply-To: <20111017085826.7a62ed11@nehalam.linuxnetplumber.net>

On 10/17/11 17:58, Stephen Hemminger wrote:

> On Mon, 17 Oct 2011 17:43:37 +0200
> Oliver Hartkopp <socketcan@hartkopp.net> wrote:
> 
>> The ip-tool from iproute2 already supports to pass a user defined SJW
>> value for the in-kernel bittiming calculation. This patch updates the
>> help text accordingly.
>>
>> Signed-off-by: Oliver Hartkopp <socketcan@hartkopp.net>
>>
>> ---
>>
>> diff --git a/ip/iplink_can.c b/ip/iplink_can.c
>> index c8af4bc..00e7d98 100644
>> --- a/ip/iplink_can.c
>> +++ b/ip/iplink_can.c
>> @@ -23,7 +23,8 @@ static void usage(void)
>>  {
>>  	fprintf(stderr,
>>  		"Usage: ip link set DEVICE type can\n"
>> -	        "\t[ bitrate BITRATE [ sample-point SAMPLE-POINT] ] | \n"
>> +		"\t[ bitrate BITRATE [ sample-point SAMPLE-POINT ] [ sjw SJW "
>> +		"] ] | \n"
>>  	        "\t[ tq TQ prop-seg PROP_SEG phase-seg1 PHASE-SEG1\n "
>>  		"\t  phase-seg2 PHASE-SEG2 [ sjw SJW ] ]\n"
>>  		"\n"
> 
> Please update man page as well.


Oops. The manpage has several issues regarding CAN support:

- this updated help text is _not_ part of the ip.8 man page at all

    It can only be accessed by 'ip link set <anynetdev> type can help'

Usage: ip link set DEVICE type can
	[ bitrate BITRATE [ sample-point SAMPLE-POINT] ] |
	[ tq TQ prop-seg PROP_SEG phase-seg1 PHASE-SEG1
 	  phase-seg2 PHASE-SEG2 [ sjw SJW ] ]

	[ loopback { on | off } ]
	[ listen-only { on | off } ]
	[ triple-sampling { on | off } ]
	[ one-shot { on | off } ]
	[ berr-reporting { on | off } ]

	[ restart-ms TIME-MS ]
	[ restart ]

	Where: BITRATE       := { 1..1000000 }
	       SAMPLE-POINT  := { 0.000..0.999 }
	       TQ            := { NUMBER }
	       PROP-SEG      := { 1..8 }
	       PHASE-SEG1    := { 1..8 }
	       PHASE-SEG2    := { 1..8 }
	       SJW           := { 1..4 }
	       RESTART-MS    := { 0 | NUMBER }

-> ip link set <anynetdev> "type TYPE" is not documented in help text & man
page anywhere

- VCAN and CAN interfaces are mixed in the man page

    You can not create real CAN interfaces, only virtual ones.

Looks like i tapped into a bigger problem here :-(

Maybe it's the best to apply this help text update first and then to try to
rework the ip.8 man page according to the latest version.

Setting the CAN bittiming & controller setting does not seem to fit into the
'ip link' section of the man page. Do you have an idea how to do that in a
'nice' way?

Regards,
Oliver

^ permalink raw reply

* Re: [PATCH net-next] net: ipv6: inet6_connection_sock.h needs flowi
From: Christoph Paasch @ 2011-10-17 16:59 UTC (permalink / raw)
  To: David Miller; +Cc: netdev
In-Reply-To: <20111016.201310.2196482600418365872.davem@davemloft.net>

On 10/17/2011 03:13 AM, David Miller wrote:
> From: Christoph Paasch<christoph.paasch@uclouvain.be>
> Date: Sun, 16 Oct 2011 12:13:39 +0300
>
>> On 10/16/2011 01:41 AM, David Miller wrote:
>>> From: Christoph Paasch<christoph.paasch@uclouvain.be>
>>> Date: Sat, 15 Oct 2011 12:34:24 +0300
>>>
>>>> Otherwise we have a compiler-warning in c-files not including
>>>> net/flow.h
>>>> before inet6_connection_sock.h .
>>>>
>>>> Signed-off-by: Christoph Paasch<christoph.paasch@uclouvain.be>
>>>
>>> Example?  I've never seen this warning.
>>
>> Currently, all the c-files that include inet6_connection_sock.h
>> indirectly include flow.h before inet6_connection_sock.h. Thus
>> currently there is no compiler-warning.
>
> Then there is no bug you are fixing.

You're right. The patch did not intend to fix a bug (maybe the 
commit-message should have been more clear about that).
It was intended to make inet6_connection_sock.h not rely on the c-files 
to include flow.h, even if they would not need to. And to do the same 
for struct flowi as it is done for the other structs in this 
header-file. Thus it was rather a coding-style patch... :)

But ok, maybe I should not try to change something which is not really 
broken... ;-)

Christoph


-- 
Christoph Paasch
PhD Student

IP Networking Lab --- http://inl.info.ucl.ac.be
MultiPath TCP in the Linux Kernel --- http://inl.info.ucl.ac.be/mptcp
Université Catholique de Louvain
-- 

^ permalink raw reply

* Re: [PATCH net-next] tcp: reduce memory needs of out of order queue
From: Rick Jones @ 2011-10-17 16:47 UTC (permalink / raw)
  To: Eric Dumazet; +Cc: David Miller, netdev
In-Reply-To: <1318660775.2525.29.camel@edumazet-laptop>

>
> Rick, could you redo the test, using following bit on receiver :
>
> echo 1>/proc/sys/net/ipv4/tcp_adv_win_scale


raj@tardy:~/netperf2_trunk$ netstat -s > before; src/netperf -H 
raj-8510w.americas.hpqcorp.net -t tcp_rr -- -b 256 -D -o 
throughput,local_transport_retrans,remote_transport_retrans,lss_size_end,rsr_size_end 
; netstat -s > afterMIGRATED TCP REQUEST/RESPONSE TEST from 0.0.0.0 
(0.0.0.0) port 0 AF_INET to internal-host.americas.hpqcorp.net 
(16.89.245.115) port 0 AF_INET : nodelay : first burst 256
Throughput,Local Transport Retransmissions,Remote Transport 
Retransmissions,Local Send Socket Size Final,Remote Recv Socket Size Final
78527.68,289,0,16384,98304

Deltas on the receiver:

TcpExt:
     27 packets pruned from receive queue because of socket buffer overrun
     0 TCP sockets finished time wait in fast timer
     0 delayed acks sent
     0 delayed acks further delayed because of locked socket
     Quick ack mode was activated 0 times
     19 packets directly queued to recvmsg prequeue.
     0 bytes directly in process context from backlog
     670 bytes directly received in process context from prequeue
     739983 packet headers predicted
     14 packets header predicted and directly queued to user
     127 acknowledgments not containing data payload received
     235774 predicted acknowledgments
     0 other TCP timeouts
     6553 packets collapsed in receive queue due to low socket buffer
     0 DSACKs sent for old packets
     TCPBacklogDrop: 294

So, moving on to:

> If you still have collapses/retransmits, you then could try :
>
> echo -2>/proc/sys/net/ipv4/tcp_adv_win_scale

raj@tardy:~/netperf2_trunk$ netstat -s > before; src/netperf -H 
raj-8510w.americas.hpqcorp.net -t tcp_rr -- -b 256 -D -o 
throughput,local_transport_retrans,remote_transport_retrans,lss_size_end,rsr_size_end 
; netstat -s > after
MIGRATED TCP REQUEST/RESPONSE TEST from 0.0.0.0 (0.0.0.0) port 0 AF_INET 
to internal-host.americas.hpqcorp.net (16.89.245.115) port 0 AF_INET : 
nodelay : first burst 256
Throughput,Local Transport Retransmissions,Remote Transport 
Retransmissions,Local Send Socket Size Final,Remote Recv Socket Size Final
95981.83,0,0,121200,156600

No retransmissions in that one.

rick

^ permalink raw reply

* Re: [net-next 5/6] ixgbe: add hardware timestamping support
From: Richard Cochran @ 2011-10-17 16:44 UTC (permalink / raw)
  To: Jeff Kirsher; +Cc: davem, Jacob Keller, netdev, gospo, sassmann
In-Reply-To: <1318854062-3628-6-git-send-email-jeffrey.t.kirsher@intel.com>

On Mon, Oct 17, 2011 at 05:21:01AM -0700, Jeff Kirsher wrote:
> The cyclecounter has the potential to miss a wrap-around of the
> systim register (this should occur no more often than every 35
> seconds) unless some activity regarding the cycle counter occurs at
> least once within this time. This version adds a cycle counter read
> every time the watchdog task is run, which should occur at least once
> within this timeframe. Any packets being timestamped will also count
> as a read due to the call to timecompare_update.

So, is this wrap around due to the fact that you are tied to the
system time via time_compare? Or, putting it another way, can't you
program the hardware time stamping unit so that the registers have
some reasonable resolution (like 64 bits worth of nanoseconds) and
just offer RAW timestamps?

I would really like to move away from the timecompare hacks and
towards a proper PHC->SYS PPS solution.

> This version fixes an issue regarding timecompare not updating
> detected skew after the clock offset is changed due to ptpd or outside
> influence from the OS. Now the skew detection is forced just before we
> hand a timestamp up to the kernel stack

Again, doing the update thing on every packet won't work for real
world PTP scenarios.

Thanks,
Richard

^ permalink raw reply

* Re: [PATCH] bnx2x: Adding FW 7.0.29.0
From: Dmitry Kravkov @ 2011-10-17 16:12 UTC (permalink / raw)
  To: dwmw2@infradead.org
  Cc: ben@decadent.org.uk, netdev@vger.kernel.org, Eilon Greenstein
In-Reply-To: <1318860047-5044-1-git-send-email-dmitry@broadcom.com>

Adding netdev

On Mon, 2011-10-17 at 07:00 -0700, Dmitry Kravkov wrote:
> Includes fixes for the following issues:
>   1. (iSCSI) Arrival of un-solicited ASYNC message causes
>      firmware to abort the connection with RST.
>   2. (FCoE) There is a probability that truncated FCoE packet on
>      RX path won't get detected which might lead to FW assert.
>   3. (iSCSI) Arrival of target-initiated NOP-IN during intense
>      ISCSI traffic might lead to FW assert.
>   4. (iSCSI) Chip hangs when in case of retransmission not aligned
>      to 4-bytes from the beginning of iSCSI PDU.
>   5. (FCoE) Arrival of packets beyond task IO size can lead to crash.
> 
> 
> 
> Signed-off-by: Dmitry Kravkov <dmitry@broadcom.com>
> Signed-off-by: Eilon Greenstein <eilong@broadcom.com>
> ---
> The patch also available at:
> http://linux.broadcom.com/eilong/FW-7.0.29.0/0001-bnx2x-Adding-FW-7.0.29.0.patch
> ___

^ permalink raw reply

* Re: [PATCH] iproute2: update CAN bitrate SJW help text
From: Stephen Hemminger @ 2011-10-17 15:58 UTC (permalink / raw)
  To: Oliver Hartkopp; +Cc: Wolfgang Grandegger, Linux Netdev List, linux-can
In-Reply-To: <4E9C4D29.7010302@hartkopp.net>

On Mon, 17 Oct 2011 17:43:37 +0200
Oliver Hartkopp <socketcan@hartkopp.net> wrote:

> The ip-tool from iproute2 already supports to pass a user defined SJW
> value for the in-kernel bittiming calculation. This patch updates the
> help text accordingly.
> 
> Signed-off-by: Oliver Hartkopp <socketcan@hartkopp.net>
> 
> ---
> 
> diff --git a/ip/iplink_can.c b/ip/iplink_can.c
> index c8af4bc..00e7d98 100644
> --- a/ip/iplink_can.c
> +++ b/ip/iplink_can.c
> @@ -23,7 +23,8 @@ static void usage(void)
>  {
>  	fprintf(stderr,
>  		"Usage: ip link set DEVICE type can\n"
> -	        "\t[ bitrate BITRATE [ sample-point SAMPLE-POINT] ] | \n"
> +		"\t[ bitrate BITRATE [ sample-point SAMPLE-POINT ] [ sjw SJW "
> +		"] ] | \n"
>  	        "\t[ tq TQ prop-seg PROP_SEG phase-seg1 PHASE-SEG1\n "
>  		"\t  phase-seg2 PHASE-SEG2 [ sjw SJW ] ]\n"
>  		"\n"

Please update man page as well.

^ permalink raw reply

* Re: [net-next 6/6] ixgbe: change the eeprom version reported by ethtool
From: Joe Perches @ 2011-10-17 15:57 UTC (permalink / raw)
  To: Jeff Kirsher; +Cc: davem, Emil Tantilov, netdev, gospo, sassmann
In-Reply-To: <1318854062-3628-7-git-send-email-jeffrey.t.kirsher@intel.com>

On Mon, 2011-10-17 at 05:21 -0700, Jeff Kirsher wrote:
> From: Emil Tantilov <emil.s.tantilov@intel.com>
> 
> Use 32bit value starting at offset 0x2d for displaying the firmware
> version in ethtool. This should work for all current ixgbe HW
[]
> diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c
[]
> -	snprintf(firmware_version, sizeof(firmware_version), "%d.%d-%d",
> -	         (adapter->eeprom_version & 0xF000) >> 12,
> -	         (adapter->eeprom_version & 0x0FF0) >> 4,
> -	         adapter->eeprom_version & 0x000F);
> +	nvm_track_id = (adapter->eeprom_verh << 16) |
> +			adapter->eeprom_verl;
> +	snprintf(firmware_version, sizeof(firmware_version), "0x%08x",
> +		 nvm_track_id);

Is ethtool output like proc output considered an abi
that should not be changed?

^ permalink raw reply

* Re: sky2: only 10Mb/s
From: Stephen Hemminger @ 2011-10-17 15:56 UTC (permalink / raw)
  To: Pavel Mateja; +Cc: netdev
In-Reply-To: <201110171434.50436.pavel@netsafe.cz>

On Mon, 17 Oct 2011 14:34:50 +0200
Pavel Mateja <pavel@netsafe.cz> wrote:

> Hi,
> I tested new kernel and I have found out I have only 10Mb/s link instead of 
> 100Mb/s to my router.
> If I did the git bisect right it was caused by commit 
> 4fb99cd6ac4fe6d03a334a6f4ebb2bbfc4b479ed which was submitted by you.
> 
> My card is (lspci -v):
> 05:00.0 Ethernet controller: Marvell Technology Group Ltd. Yukon Optima 
> 88E8059 [PCIe Gigabit Ethernet Controller with AVB] (rev 11)
>         Subsystem: ASUSTeK Computer Inc. Device 8439
>         Flags: bus master, fast devsel, latency 0, IRQ 80
>         Memory at fe6fc000 (64-bit, non-prefetchable) [size=16K]
>         I/O ports at b800 [size=256]
>         Expansion ROM at fe6c0000 [disabled] [size=128K]
>         Capabilities: [48] Power Management version 3
>         Capabilities: [5c] MSI: Enable+ Count=1/1 Maskable- 64bit+
>         Capabilities: [c0] Express Legacy Endpoint, MSI 00
>         Capabilities: [100] Advanced Error Reporting
>         Capabilities: [130] Device Serial Number a5-89-6d-ff-ff-30-cf-20
>         Kernel driver in use: sky2
> 
> I'm quite sure it's related to Yukon Optima because "Ethernet controller: 
> Marvell Technology Group Ltd. 88E8056 PCI-E Gigabit Ethernet Controller" in my 
> work computer has 100Mb/s with the same kernel and driver.
> 
> I got no response on netdev@vger.kernel.org.
> Can you help me?

What is output of dmesg for sky2.
 dmesg | grep sky2

The problem is related to PHY setup. Almost all of that is copied from the
vendor driver. It might take a few steps to fix because I don't think I
have one of those cards handy.

^ permalink raw reply


This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox