10 years agonetfilter: conntrack: replace notify chain by function pointer
Pablo Neira Ayuso [Wed, 3 Jun 2009 08:32:06 +0000]
netfilter: conntrack: replace notify chain by function pointer

This patch removes the notify chain infrastructure and replace it
by a simple function pointer. This issue has been mentioned in the
mailing list several times: the use of the notify chain adds
too much overhead for something that is only used by ctnetlink.

This patch also changes nfnetlink_send(). It seems that gfp_any()
returns GFP_KERNEL for user-context request, like those via
ctnetlink, inside the RCU read-side section which is not valid.
Using GFP_KERNEL is also evil since netlink may schedule(),
this leads to "scheduling while atomic" bug reports.

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

10 years agonetfilter: conntrack: simplify event caching system
Pablo Neira Ayuso [Tue, 2 Jun 2009 18:08:46 +0000]
netfilter: conntrack: simplify event caching system

This patch simplifies the conntrack event caching system by removing
several events:

 * IPCT_[*]_VOLATILE, IPCT_HELPINFO and IPCT_NATINFO has been deleted
   since the have no clients.
 * IPCT_COUNTER_FILLING which is a leftover of the 32-bits counter
   days.
 * IPCT_REFRESH which is not of any use since we always include the
   timeout in the messages.

After this patch, the existing events are:

 * IPCT_NEW, IPCT_RELATED and IPCT_DESTROY, that are used to identify
 addition and deletion of entries.
 * IPCT_STATUS, that notes that the status bits have changes,
 eg. IPS_SEEN_REPLY and IPS_ASSURED.
 * IPCT_PROTOINFO, that reports that internal protocol information has
 changed, eg. the TCP, DCCP and SCTP protocol state.
 * IPCT_HELPER, that a helper has been assigned or unassigned to this
 entry.
 * IPCT_MARK and IPCT_SECMARK, that reports that the mark has changed, this
 covers the case when a mark is set to zero.
 * IPCT_NATSEQADJ, to report that there's updates in the NAT sequence
 adjustment.

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

10 years agonetfilter: conntrack: remove events flags from userspace exposed file
Pablo Neira Ayuso [Tue, 2 Jun 2009 18:08:44 +0000]
netfilter: conntrack: remove events flags from userspace exposed file

This patch moves the event flags from linux/netfilter/nf_conntrack_common.h
to net/netfilter/nf_conntrack_ecache.h. This flags are not of any use
from userspace.

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

10 years agonetfilter: conntrack: don't report events on module removal
Pablo Neira Ayuso [Tue, 2 Jun 2009 18:08:38 +0000]
netfilter: conntrack: don't report events on module removal

During the module removal there are no possible event listeners
since ctnetlink must be removed before to allow removing
nf_conntrack. This patch removes the event reporting for the
module removal case which is not of any use in the existing code.

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

10 years agonetfilter: ctnetlink: cleanup message-size calculation
Pablo Neira Ayuso [Tue, 2 Jun 2009 18:08:27 +0000]
netfilter: ctnetlink: cleanup message-size calculation

This patch cleans up the message calculation to make it similar
to rtnetlink, moreover, it removes unneeded verbose information.

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

10 years agonetfilter: ctnetlink: use nlmsg_* helper function to build messages
Pablo Neira Ayuso [Tue, 2 Jun 2009 18:07:39 +0000]
netfilter: ctnetlink: use nlmsg_* helper function to build messages

Replaces the old macros to build Netlink messages with the
new nlmsg_*() helper functions.

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

10 years agonetfilter: ctnetlink: rename tuple() by nf_ct_tuple() macro definition
Pablo Neira Ayuso [Tue, 2 Jun 2009 18:03:35 +0000]
netfilter: ctnetlink: rename tuple() by nf_ct_tuple() macro definition

This patch move the internal tuple() macro definition to the
header file as nf_ct_tuple().

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

10 years agonetfilter: ctnetlink: remove nowait parameter from *fill_info()
Pablo Neira Ayuso [Tue, 2 Jun 2009 18:03:34 +0000]
netfilter: ctnetlink: remove nowait parameter from *fill_info()

This patch is a cleanup, it removes the `nowait' parameter
from all *fill_info() function since it is always set to one.

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

10 years agonetfilter: nfnetlink: cleanup for nfnetlink_rcv_msg() function
Pablo Neira Ayuso [Tue, 2 Jun 2009 18:03:33 +0000]
netfilter: nfnetlink: cleanup for nfnetlink_rcv_msg() function

This patch cleans up the message handling path in two aspects:

 * it uses NLMSG_LENGTH() instead of NLMSG_SPACE() like rtnetlink
does in this case to check if there is enough room for the
Netlink/nfnetlink headers. No need to check for the padding room.

 * it removes a redundant header size checking that has been
 already do at the beginning of the function.

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

10 years agonetfilter: nf_ct_tcp: TCP simultaneous open support
Jozsef Kadlecsik [Tue, 2 Jun 2009 11:58:56 +0000]
netfilter: nf_ct_tcp: TCP simultaneous open support

The patch below adds supporting TCP simultaneous open to conntrack. The
unused LISTEN state is replaced by a new state (SYN_SENT2) denoting the
second SYN sent from the reply direction in the new case. The state table
is updated and the function tcp_in_window is modified to handle
simultaneous open.

The functionality can fairly easily be tested by socat. A sample tcpdump
recording

23:21:34.244733 IP (tos 0x0, ttl 64, id 49224, offset 0, flags [DF], proto TCP (6), length 60) 192.168.0.254.2020 > 192.168.0.1.2020: S, cksum 0xe75f (correct), 3383710133:3383710133(0) win 5840 <mss 1460,sackOK,timestamp 173445629 0,nop,wscale 7>
23:21:34.244783 IP (tos 0x0, ttl 64, id 0, offset 0, flags [DF], proto TCP (6), length 40) 192.168.0.1.2020 > 192.168.0.254.2020: R, cksum 0x0253 (correct), 0:0(0) ack 3383710134 win 0
23:21:36.038680 IP (tos 0x0, ttl 64, id 28092, offset 0, flags [DF], proto TCP (6), length 60) 192.168.0.1.2020 > 192.168.0.254.2020: S, cksum 0x704b (correct), 2634546729:2634546729(0) win 5840 <mss 1460,sackOK,timestamp 824213 0,nop,wscale 1>
23:21:36.038777 IP (tos 0x0, ttl 64, id 49225, offset 0, flags [DF], proto TCP (6), length 60) 192.168.0.254.2020 > 192.168.0.1.2020: S, cksum 0xb179 (correct), 3383710133:3383710133(0) ack 2634546730 win 5840 <mss 1460,sackOK,timestamp 173447423 824213,nop,wscale 7>
23:21:36.038847 IP (tos 0x0, ttl 64, id 28093, offset 0, flags [DF], proto TCP (6), length 52) 192.168.0.1.2020 > 192.168.0.254.2020: ., cksum 0xebad (correct), ack 3383710134 win 2920 <nop,nop,timestamp 824213 173447423>

and the corresponding netlink events:

    [NEW] tcp      6 120 SYN_SENT src=192.168.0.254 dst=192.168.0.1 sport=2020 dport=2020 [UNREPLIED] src=192.168.0.1 dst=192.168.0.254 sport=2020 dport=2020
 [UPDATE] tcp      6 120 LISTEN src=192.168.0.254 dst=192.168.0.1 sport=2020 dport=2020 src=192.168.0.1 dst=192.168.0.254 sport=2020 dport=2020
 [UPDATE] tcp      6 60 SYN_RECV src=192.168.0.254 dst=192.168.0.1 sport=2020 dport=2020 src=192.168.0.1 dst=192.168.0.254 sport=2020 dport=2020
 [UPDATE] tcp      6 432000 ESTABLISHED src=192.168.0.254 dst=192.168.0.1 sport=2020 dport=2020 src=192.168.0.1 dst=192.168.0.254 sport=2020 dport=2020 [ASSURED]

The RST packet was dropped in the raw table, thus it did not reach
conntrack.  nfnetlink_conntrack is unpatched so it shows the new SYN_SENT2
state as the old unused LISTEN.

With TCP simultaneous open support we satisfy REQ-2 in RFC 5382  ;-) .

Additional minor correction in this patch is that in order to catch
uninitialized reply directions, "td_maxwin == 0" is used instead of
"td_end == 0" because the former can't be true except in uninitialized
state while td_end may accidentally be equal to zero in the mid of a
connection.

Signed-off-by: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
Signed-off-by: Patrick McHardy <kaber@trash.net>

10 years agoMerge branch 'master' of git://dev.medozas.de/linux
Patrick McHardy [Tue, 2 Jun 2009 11:44:56 +0000]
Merge branch 'master' of git://dev.medozas.de/linux

10 years agonetfilter: conntrack: add support for DCCP handshake sequence to ctnetlink
Pablo Neira Ayuso [Wed, 27 May 2009 15:50:35 +0000]
netfilter: conntrack: add support for DCCP handshake sequence to ctnetlink

This patch adds CTA_PROTOINFO_DCCP_HANDSHAKE_SEQ that exposes
the u64 handshake sequence number to user-space.

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: Patrick McHardy <kaber@trash.net>

10 years agotcp: Do not check flush when comparing options for GRO
Herbert Xu [Tue, 26 May 2009 18:50:34 +0000]
tcp: Do not check flush when comparing options for GRO

There is no need to repeatedly check flush when comparing TCP
options for GRO as it will be false 99% of the time where it
matters.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>

10 years agogro: Store shinfo in local variable in skb_gro_receive
Herbert Xu [Tue, 26 May 2009 18:50:33 +0000]
gro: Store shinfo in local variable in skb_gro_receive

This patch stores the two shinfo pointers in local variables
because they're used over and over again in skb_gro_receive.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>

10 years agogro: Nasty optimisations for page frags in skb_gro_receive
Herbert Xu [Tue, 26 May 2009 18:50:32 +0000]
gro: Nasty optimisations for page frags in skb_gro_receive

This patch reverses the direction of the frags array copy in
skb_gro_receive in order simplify the loop conditional.  It
also avoids touching the first element of the original frags
array.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>

10 years agogro: Open-code final pskb_may_pull
Herbert Xu [Tue, 26 May 2009 18:50:31 +0000]
gro: Open-code final pskb_may_pull

As we know the only packets which need the final pskb_may_pull
are completely non-linear, and have all the required bits in
frag0, we can perform a straight memcpy instead of going through
pskb_may_pull and doing skb_copy_bits.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>

10 years agoipv4: Use 32-bit loads for ID and length in GRO
Herbert Xu [Tue, 26 May 2009 18:50:29 +0000]
ipv4: Use 32-bit loads for ID and length in GRO

This patch optimises the IPv4 GRO code by using 32-bit loads
(instead of 16-bit ones) on the ID and length checks in the receive
function.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>

10 years agogro: Avoid unnecessary comparison after skb_gro_header
Herbert Xu [Tue, 26 May 2009 18:50:28 +0000]
gro: Avoid unnecessary comparison after skb_gro_header

For the overwhelming majority of cases, skb_gro_header's return
value cannot be NULL.  Yet we must check it because of its current
form.  This patch splits it up into multiple functions in order
to avoid this.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>

10 years agogro: Optimise length comparison in skb_gro_header
Herbert Xu [Tue, 26 May 2009 18:50:27 +0000]
gro: Optimise length comparison in skb_gro_header

By caching frag0_len, we can avoid checking both frag0 and the
length separately in skb_gro_header.  This helps as skb_gro_header
is called four times per packet which amounts to a few million
times at 10Gb/s.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>

10 years agotcp: Optimise len/mss comparison
Herbert Xu [Tue, 26 May 2009 18:50:26 +0000]
tcp: Optimise len/mss comparison

Instead of checking len > mss || len == 0, we can accomplish
both by checking (len - 1) > mss using the unsigned wraparound.
At nearly a million times a second, this might just help.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>

10 years agotcp: Remove unnecessary window comparisons for GRO
Herbert Xu [Tue, 26 May 2009 18:50:25 +0000]
tcp: Remove unnecessary window comparisons for GRO

The window has already been checked as part of the flag word
so there is no need to check it explicitly.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>

10 years agotcp: Optimise GRO port comparisons
Herbert Xu [Tue, 26 May 2009 18:50:24 +0000]
tcp: Optimise GRO port comparisons

Instead of doing two 16-bit operations for the source/destination
ports, we can do one 32-bit operation to take care both.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>

10 years agogro: Only use skb_gro_header for completely non-linear packets
Herbert Xu [Tue, 26 May 2009 18:50:23 +0000]
gro: Only use skb_gro_header for completely non-linear packets

Currently skb_gro_header is used for packets which put the hardware
header in skb->data with the rest in frags.  Since the drivers that
need this optimisation all provide completely non-linear packets,
we can gain extra optimisations by only performing the frag0
optimisation for completely non-linear packets.

In particular, we can simply test frag0 (instead of skb_headlen)
to see whether the optimisation is in force.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>

10 years agogro: Localise offset/headlen in skb_gro_offset
Herbert Xu [Tue, 26 May 2009 18:50:22 +0000]
gro: Localise offset/headlen in skb_gro_offset

This patch stores the offset/headlen in local variables as they're
used repeatedly in skb_gro_offset.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>

10 years agogro: Inline skb_gro_header and cache frag0 virtual address
Herbert Xu [Tue, 26 May 2009 18:50:21 +0000]
gro: Inline skb_gro_header and cache frag0 virtual address

The function skb_gro_header is called four times per packet which
quickly adds up at 10Gb/s.  This patch inlines it to allow better
optimisations.

Some architectures perform multiplication for page_address, which
is done by each skb_gro_header invocation.  This patch caches that
value in skb->cb to avoid the unnecessary multiplications.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>

10 years agogro: Open-code frags copy in skb_gro_receive
Herbert Xu [Tue, 26 May 2009 18:50:19 +0000]
gro: Open-code frags copy in skb_gro_receive

gcc does a poor job at generating code for the memcpy of the frags
array in skb_gro_receive, which is the primary purpose of that
function when merging frags.  In particular, it can't utilise the
alignment information of the source and destination.  This patch
open-codes the copy so we process words instead of bytes.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>

10 years agoixgbe: Fix build warning
Peter P Waskiewicz Jr [Wed, 27 May 2009 04:41:18 +0000]
ixgbe: Fix build warning

This patch fixes a build warning due to an unused label.

Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

10 years agophy: Eliminate references to BUS_ID_SIZE.
David S. Miller [Wed, 27 May 2009 04:16:25 +0000]
phy: Eliminate references to BUS_ID_SIZE.

Just use the constant 20 to keep things working.

If someone is so motivated, this can be converted over to
dynamic strings.  I tried and it's a lot of work.

But for now this is good enough.

Signed-off-by: David S. Miller <davem@davemloft.net>

10 years agonl80211: Eliminate reference to BUS_ID_SIZE.
David S. Miller [Wed, 27 May 2009 04:15:00 +0000]
nl80211: Eliminate reference to BUS_ID_SIZE.

It's going away.  Just leave the constant "20" here so that
behavior doesn't change.

Signed-off-by: David S. Miller <davem@davemloft.net>

10 years agosh_eth: Remove references to BUS_ID_SIZE, use MII_BUS_ID_SIZE instead.
David S. Miller [Wed, 27 May 2009 04:11:09 +0000]
sh_eth: Remove references to BUS_ID_SIZE, use MII_BUS_ID_SIZE instead.

Signed-off-by: David S. Miller <davem@davemloft.net>

10 years agocpmac: Remove references to BUS_ID_SIZE, use MII_BUS_ID_SIZE.
David S. Miller [Wed, 27 May 2009 04:10:22 +0000]
cpmac: Remove references to BUS_ID_SIZE, use MII_BUS_ID_SIZE.

Signed-off-by: David S. Miller <davem@davemloft.net>

10 years agoixp4xx_eth: Remove references to BUS_ID_SIZE.
David S. Miller [Wed, 27 May 2009 04:09:33 +0000]
ixp4xx_eth: Remove references to BUS_ID_SIZE.

Use MII_BUS_ID_SIZE instead.

Signed-off-by: David S. Miller <davem@davemloft.net>

10 years agonet: Remove bogus reference to BUS_ID_SIZE in sysfs code.
David S. Miller [Wed, 27 May 2009 04:05:19 +0000]
net: Remove bogus reference to BUS_ID_SIZE in sysfs code.

BUS_ID_SIZE is really no more, and device names are dynamically
allocated and thus can be any necessary size.

So remove the BUG check here making sure BUS_ID_SIZE is at least
as large as IFNAMSIZ.

Signed-off-by: David S. Miller <davem@davemloft.net>

10 years agor8169: Use a different default for each family
Jean Delvare [Wed, 27 May 2009 03:54:48 +0000]
r8169: Use a different default for each family

The r8169 driver supports 3 different families of network chips
(RTL8169, RTL8168 and RTL8101). When an unknown version is found, the
driver currently always defaults to the RTL8169 variant. This has very
little chance to ever work for chips of the other families. So better
define a per-family default.

Signed-off-by: Jean Delvare <jdelvare@suse.de>
Acked-by: Francois Romieu <romieu@fr.zoreil.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

10 years agonet/ucc_geth: allow to set mac address on running device
Kevin Hao [Wed, 27 May 2009 03:49:03 +0000]
net/ucc_geth: allow to set mac address on running device

Inspired by the patch for 8139too (bda6a15a).

Currently we can't set mac address on a running ucc_geth device.
But this is needed when you use this device as a bonding slave in
bonding device in balance-alb mode. So add this feature for ucc_geth
device.

Signed-off-by: Kevin Hao <kexin.hao@windriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

10 years agoniu: Add support for C10NEM
Tanli Chang [Wed, 27 May 2009 03:45:50 +0000]
niu: Add support for C10NEM

This patch is for supporting C10NEM. C10NEM is a switch module, which
has back-to-back XAUI link connected to blades.

Signed-off-by: Tanli Chang <tanli.chang@sun.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

10 years agoixgbe: fix 82598 SFP initialization after driver load.
Don Skidmore [Wed, 27 May 2009 03:40:47 +0000]
ixgbe: fix 82598 SFP initialization after driver load.

If we loaded the driver with out a SFP module plugged in it would
leave it in a state that make it later unable to link when a module
was plugged in.  This patch corrects that by:

ixgbe_probe() - moving the check for IXGBE_ERR_SFP_NOT_PRESENT from
after get_invariants() to after reset_hw() as now reset_hw() is
where this condition will be indentified.

ixgbe_reset_hw_82598() - Enable this function to now return
IXGBE_ERR_SFP_NOT_PRESENT.

ixgbe_identify_sfp_module_generic() - This where the lack of SFP
module is detected.  Modifications are added to allow a different
return value for modules that just haven't been plugged in yet.

Other functions were updated to allow correct logging.

Signed-off-by: Don Skidmore <donald.c.skidmore@intel.com>
Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

10 years agoixgbe: Remove device ID 0x10d8
Peter P Waskiewicz Jr [Wed, 27 May 2009 03:40:09 +0000]
ixgbe: Remove device ID 0x10d8

Device ID 0x10d8 is the default silicon device ID for 82599.  However, the
device will not be functional without an EEPROM, so we want to prevent the
driver from loading on the device.  Otherwise, the driver will load, but no
PHY setup or PCIe setup will occur, causing the device to be unusable.  To
prevent users from encountering this, just remove the device ID.

Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

10 years agoigb/e1000e: update PSSR_MDIX value to reflect correct bit
Alexander Duyck [Tue, 26 May 2009 13:51:05 +0000]
igb/e1000e: update PSSR_MDIX value to reflect correct bit

The phy port status register has the MDI-X status bit on bit 11, not bit 3
as is currently setup in the define.  This patch corrects that so the
correct bit is checked on igp PHY types.

Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com>
Acked-by: Bruce Allan <bruce.w.allan@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

10 years agoigb: Record host memory receive overflow in net_stats
Jesper Dangaard Brouer [Tue, 26 May 2009 13:50:48 +0000]
igb: Record host memory receive overflow in net_stats

Based on previous patch from Jesper Dangaard Brouer.

The RNBC (Receive No Buffers Count) register for the 82576, indicate
that frames were received when there were no available buffers in host
memory to store those frames (receive descriptor head and tail
pointers were equal).  The packet is still received by the NIC if
there is space in the FIFO on the NIC.

As the RNBC value is not a packet drop, the driver stores this value
in net_stats.rx_fifo_errors to indicate that there were no system
buffers available for the incoming packet.  Actual dropped packets
are counted in the MPC value.

Saving the stats in dev->net_stats makes it visible via
/proc/net/dev as "fifo", and thus viewable to ifconfig
as "overruns" and 'netstat -i' as "RX-OVR".

The Receive No Buffers Count (RNBC) can already be queried by
ethtool -S as "rx_no_buffer_count".

Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
CC: Jesper Dangaard Brouer <hawk@comx.dk>
Signed-off-by: David S. Miller <davem@davemloft.net>

10 years agoigb: Implement reading of reg RQDPC (Receive Queue Drop Packet Count)
Jesper Dangaard Brouer [Tue, 26 May 2009 13:50:31 +0000]
igb: Implement reading of reg RQDPC (Receive Queue Drop Packet Count)

Based on the previous patches from Jesper Dangaard Brouer <hawk@comx.dk>

Implement reading the per queue drop stats register
RQDPC (Receive Queue Drop Packet Count).  It counts the number of
packets dropped by a queue due to lack of descriptors available.

Notice RQDPC (Receive Queue Drop Packet Count) stats only gets
incremented, if the DROP_EN bit it set (in the SRRCTL register
for that queue).  If DROP_EN bit is NOT set, then the some what
equivalent count is stored in RNBC (not per queue basis).

The RQDPC register is only 12 bit, thus the precision might
suffer due to overrun in-netween the watchdog polling interval.

Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
CC: Jesper Dangaard Brouer <hawk@comx.dk>
Signed-off-by: David S. Miller <davem@davemloft.net>

10 years agoigb: add RQDPC (Receive Queue Drop Packet Count) register macro
Jeff Kirsher [Tue, 26 May 2009 13:50:15 +0000]
igb: add RQDPC (Receive Queue Drop Packet Count) register macro

Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

10 years ago8139*: convert printk() to pr_<foo>()
Alexander Beregalov [Tue, 26 May 2009 12:35:27 +0000]
8139*: convert printk() to pr_<foo>()

Also convert DPRINTK to pr_debug and dev_printk to dev_<foo>.

Signed-off-by: Alexander Beregalov <a.beregalov@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

10 years ago3c5xx: convert printk() to pr_<foo>()
Alexander Beregalov [Tue, 26 May 2009 12:35:26 +0000]
3c5xx: convert printk() to pr_<foo>()

Signed-off-by: Alexander Beregalov <a.beregalov@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

10 years ago3c50x: convert printk() to pr_<foo>()
Alexander Beregalov [Tue, 26 May 2009 12:35:25 +0000]
3c50x: convert printk() to pr_<foo>()

Signed-off-by: Alexander Beregalov <a.beregalov@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

10 years agoatl1: use netdev->stats
Eric Dumazet [Tue, 26 May 2009 06:48:43 +0000]
atl1: use netdev->stats

Get rid of private struct net_device_stats in "struct atl1e_adapter",
and use one provided in struct net_device instead.

Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

10 years agonet: txq_trans_update() helper
Eric Dumazet [Tue, 26 May 2009 05:58:01 +0000]
net: txq_trans_update() helper

We would like to get rid of netdev->trans_start = jiffies; that about all net
drivers have to use in their start_xmit() function, and use txq->trans_start
instead.

This can be done generically in core network, as suggested by David.

Some devices, (particularly loopback) dont need trans_start update, because
they dont have transmit watchdog. We could add a new device flag, or rely
on fact that txq->tran_start can be updated is txq->xmit_lock_owner is
different than -1. Use a helper function to hide our choice.

Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

10 years agonet: sh_eth: Add support SH7724
Yoshihiro Shimoda [Sun, 24 May 2009 23:54:30 +0000]
net: sh_eth: Add support SH7724

Signed-off-by: Yoshihiro Shimoda <shimoda.yoshihiro@renesas.com>
Signed-off-by: Kuninori Morimoto <morimoto.kuninori@renesas.com>
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu.nobuhiro@renesas.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

10 years agonet: sh_eth: CPU dependency code collect to "struct sh_eth_cpu_data"
Yoshihiro Shimoda [Sun, 24 May 2009 23:54:21 +0000]
net: sh_eth: CPU dependency code collect to "struct sh_eth_cpu_data"

This improves readability by collecting CPU dependency code.

Signed-off-by: Yoshihiro Shimoda <shimoda.yoshihiro@renesas.com>
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu.nobuhiro@renesas.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

10 years agonet: sh_eth: fix receive desciptor loop
Yoshihiro Shimoda [Sun, 24 May 2009 23:53:40 +0000]
net: sh_eth: fix receive desciptor loop

Fix the problem that this driver not update rxdesc in sh_eth_rx.

Signed-off-by: Yoshihiro Shimoda <shimoda.yoshihiro@renesas.com>
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu.nobuhiro@renesas.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

10 years agonet: sh_eth: fix TX/RX descriptor not set physical memory
Yoshihiro Shimoda [Sun, 24 May 2009 23:53:20 +0000]
net: sh_eth: fix TX/RX descriptor not set physical memory

Fix the probrem that TX/RX descirptor not set physical memory.

Signed-off-by: Yoshihiro Shimoda <shimoda.yoshihiro@renesas.com>
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu.nobuhiro@renesas.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

10 years agonet: sh_eth: fix cache coherency issue
Yoshihiro Shimoda [Sun, 24 May 2009 23:52:35 +0000]
net: sh_eth: fix cache coherency issue

Fix the problem that may not work receive process by cache coherency issue.

Signed-off-by: Yoshihiro Shimoda <shimoda.yoshihiro@renesas.com>
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu.nobuhiro@renesas.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

10 years agopkt_sched: gen_estimator: Fix signed integers right-shifts.
Jarek Poplawski [Tue, 26 May 2009 05:47:01 +0000]
pkt_sched: gen_estimator: Fix signed integers right-shifts.

Right-shifts of signed integers are implementation-defined so unportable.

With feedback from: Eric Dumazet <dada1@cosmosbay.com>

Signed-off-by: Jarek Poplawski <jarkao2@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

10 years agonet: Remove obsolete MV64360 config option
Gabriel Paubert [Tue, 26 May 2009 05:46:19 +0000]
net: Remove obsolete MV64360 config option

Signed-off-by: Gabriel Paubert <paubert@iram.es>
Signed-off-by: David S. Miller <davem@davemloft.net>

10 years agoiwmc3200wifi: fix link error when CFG80211 is not selected
Zhu Yi [Tue, 26 May 2009 05:41:51 +0000]
iwmc3200wifi: fix link error when CFG80211 is not selected

The patch makes iwmc3200wifi select CFG80211 instead of LIB80211.
This fixed module link error reported by Randy Dunlap
<randy.dunlap@oracle.com> when compiling iwmc3200wifi without
cfg80211 selected. WIRELESS_EXT is also selected by iwmc3200wifi.

Signed-off-by: Zhu Yi <yi.zhu@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

10 years agonet: remove COMPAT_NET_DEV_OPS
Alexander Beregalov [Mon, 25 May 2009 08:53:53 +0000]
net: remove COMPAT_NET_DEV_OPS

All drivers are already converted to new net_device_ops API
and nobody uses old API anymore.

Signed-off-by: Alexander Beregalov <a.beregalov@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

10 years agoMerge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
David S. Miller [Mon, 25 May 2009 08:42:21 +0000]
Merge branch 'master' of /linux/kernel/git/davem/net-2.6

Conflicts:
drivers/net/wireless/ath/ath5k/phy.c
drivers/net/wireless/iwlwifi/iwl-agn.c
drivers/net/wireless/iwlwifi/iwl3945-base.c

10 years agomISDN: Added PCI ID for new Junghanns.net Single E1 cards.
Andreas Eversberg [Mon, 25 May 2009 07:56:56 +0000]
mISDN: Added PCI ID for new Junghanns.net Single E1 cards.

The new ID is validated by Cologne Chip.
LEDs control is also supported.

Signed-off-by: Andreas Eversberg <andreas@eversberg.eu>
Signed-off-by: Karsten Keil <keil@b1-systems.de>
Signed-off-by: David S. Miller <davem@davemloft.net>

10 years agomISDN: Fix DTMF detection enable/disable
Andreas Eversberg [Fri, 22 May 2009 11:04:58 +0000]
mISDN: Fix DTMF detection enable/disable

DTMF detection was enabled when it was not supposed to.

Signed-off-by: Andreas Eversberg <andreas@eversberg.eu>
Signed-off-by: Karsten Keil <keil@b1-systems.de>
Signed-off-by: David S. Miller <davem@davemloft.net>

10 years agomISDN: Use kernel_{send,recv}msg instead of open coding
Arnaldo Carvalho de Melo [Fri, 22 May 2009 11:04:57 +0000]
mISDN: Use kernel_{send,recv}msg instead of open coding

Reducing the number of direct users of sock_{recv,send}msg.
Modified version to match the latest context.

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Karsten Keil <keil@b1-systems.de>
Signed-off-by: David S. Miller <davem@davemloft.net>

10 years agomISDN: Cleanup debug messages
Karsten Keil [Fri, 22 May 2009 11:04:56 +0000]
mISDN: Cleanup debug messages

This patch make debug printk's KERN_DEBUG and also fix some
codestyle issues.

Signed-off-by: Karsten Keil <keil@b1-systems.de>
Signed-off-by: David S. Miller <davem@davemloft.net>

10 years agomISDN: Add PCI ID for Junghanns 8S card
Andreas Eversberg [Fri, 22 May 2009 11:04:55 +0000]
mISDN: Add PCI ID for Junghanns 8S card

new id for HFC-8S

Signed-off-by: Andreas Eversberg <andreas@eversberg.eu>
Signed-off-by: Karsten Keil <keil@b1-systems.de>
Signed-off-by: David S. Miller <davem@davemloft.net>

10 years agomISDN: get_free_devid() failure ignored
Roel Kluin [Fri, 22 May 2009 11:04:53 +0000]
mISDN: get_free_devid() failure ignored

dev->id is unsigned so a get_free_devid() error is ignored.

Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Karsten Keil <keil@b1-systems.de>
Signed-off-by: David S. Miller <davem@davemloft.net>

10 years agomISDN: Add XHFC support for embedded Speech-Design board to hfcmulti
Karsten Keil [Fri, 22 May 2009 11:04:53 +0000]
mISDN: Add XHFC support for embedded Speech-Design board to hfcmulti

New version without emulating arch specific stuff for the other
architectures, the special IO and init functions for the 8xx
microcontroller are in a separate include file.

Signed-off-by: Andreas Eversberg <andreas@eversberg.eu>
Signed-off-by: Karsten Keil <keil@b1-systems.de>
Signed-off-by: David S. Miller <davem@davemloft.net>

10 years agomISDN: Fix skb leak in error cases
Karsten Keil [Fri, 22 May 2009 11:04:52 +0000]
mISDN: Fix skb leak in error cases

If the channel receive function returns an error the skb must be freed.

Signed-off-by: Karsten Keil <keil@b1-systems.de>
Signed-off-by: David S. Miller <davem@davemloft.net>

10 years agomISDN: Add "sapi" information to debug messages
Andreas Eversberg [Fri, 22 May 2009 11:04:51 +0000]
mISDN: Add "sapi" information to debug messages

Using sapi values other than 0 work now.
The "OpenBSC" project does not require special kernel patch anymore.

Signed-off-by: Andreas Eversberg <andreas@eversberg.eu>
Signed-off-by: Karsten Keil <keil@b1-systems.de>
Signed-off-by: David S. Miller <davem@davemloft.net>

10 years agomISDN: Add allocation of recvbuf[1500] at run time to reduce stack size
Frank Seidel [Fri, 22 May 2009 11:04:51 +0000]
mISDN: Add allocation of recvbuf[1500] at run time to reduce stack size

Before: 1656 bytes on i386, now 164.
Modified by Andreas Eversberg <andreas@eversberg.eu>

Signed-off-by: Frank Seidel <frank@f-seidel.de>
Signed-off-by: Andreas Eversberg <andreas@eversberg.eu>
Signed-off-by: Karsten Keil <keil@b1-systems.de>
Signed-off-by: David S. Miller <davem@davemloft.net>

10 years agomISDN: Fix TEI and SAPI handling
Andreas Eversberg [Mon, 25 May 2009 07:50:02 +0000]
mISDN: Fix TEI and SAPI handling

Added SAPI value to use SAPIs different than 0.

Now fixed TEIs work in NT mode. This allows PTP endpoint to be connected
to PTMP ports together with other PTMP endpoints.

New enhanced version, thanks to Sam Ravnborg <sam@ravnborg.org> for the
hints.

Signed-off-by: Andreas Eversberg <andreas@eversberg.eu>
Signed-off-by: Karsten Keil <keil@b1-systems.de>
Signed-off-by: David S. Miller <davem@davemloft.net>

10 years agomISDN: Hardware acceleration is now possible in conjunction with audio recording
Andreas Eversberg [Fri, 22 May 2009 11:04:49 +0000]
mISDN: Hardware acceleration is now possible in conjunction with audio recording

Audio recording requires software audio processing.
Both hardware and software processing is simultaniously possible now.

Signed-off-by: Andreas Eversberg <andreas@eversberg.eu>
Signed-off-by: Karsten Keil <keil@b1-systems.de>
Signed-off-by: David S. Miller <davem@davemloft.net>

10 years agomISDN: Fix DTMF locking bug issue
Andreas Eversberg [Fri, 22 May 2009 11:04:48 +0000]
mISDN: Fix DTMF locking bug issue

DTMF digits were sent up to socket in locked state.
Receive audio stream was not enabled in certain condition.

Signed-off-by: Andreas Eversberg <andreas@eversberg.eu>
Signed-off-by: Karsten Keil <keil@b1-systems.de>
Signed-off-by: David S. Miller <davem@davemloft.net>

10 years agomISDN: Added layer-1-hold feature
Andreas Eversberg [Fri, 22 May 2009 11:04:48 +0000]
mISDN: Added layer-1-hold feature

Add IMHOLD_L1 ioctl.
The feature will be disabled on closing.

Signed-off-by: Andreas Eversberg <andreas@eversberg.eu>
Signed-off-by: Karsten Keil <keil@b1-systems.de>
Signed-off-by: David S. Miller <davem@davemloft.net>

10 years agomISDN: Fixed missing spin lock on pipeline process
Andreas Eversberg [Fri, 22 May 2009 11:04:47 +0000]
mISDN: Fixed missing spin lock on pipeline process

Need to protect the complete pipeline.

Signed-off-by: Andreas Eversberg <andreas@eversberg.eu>
Signed-off-by: Karsten Keil <keil@b1-systems.de>
Signed-off-by: David S. Miller <davem@davemloft.net>

10 years agomISDN: Reduce stack size in dsp_cmx_send()
Frank Seidel [Fri, 22 May 2009 11:04:47 +0000]
mISDN: Reduce stack size in dsp_cmx_send()

Reduce stack size memory footprint of mISDN_dsp.
(From 1468 bytes for dsp_cmx_send on i386 down to 44).

Signed-off-by: Frank Seidel <frank@f-seidel.de>
Signed-off-by: Andreas Eversberg <andreas@eversberg.eu>
Signed-off-by: Karsten Keil <keil@b1-systems.de>
Signed-off-by: David S. Miller <davem@davemloft.net>

10 years agomISDN: Echo canceler now gets delay information from hardware
Andreas Eversberg [Fri, 22 May 2009 11:04:46 +0000]
mISDN: Echo canceler now gets delay information from hardware

Added tx-fifo information for calculation of current delay to sync tx and rx
streams for echo canceler.

Signed-off-by: Andreas Eversberg <andreas@eversberg.eu>
Signed-off-by: Karsten Keil <keil@b1-systems.de>
Signed-off-by: David S. Miller <davem@davemloft.net>

10 years agomISDN: DSP now uses ring buffer for echo canceler
Andreas Eversberg [Fri, 22 May 2009 11:04:45 +0000]
mISDN: DSP now uses ring buffer for echo canceler

DSP now uses ring buffer for echo canceler.
Added missing include in l1oip_codec.c

Signed-off-by: Andreas Eversberg <andreas@eversberg.eu>
Signed-off-by: Karsten Keil <keil@b1-systems.de>
Signed-off-by: David S. Miller <davem@davemloft.net>

10 years agomISDN: Add watchdog functionality to hfcmulti driver
Andreas Eversberg [Fri, 22 May 2009 11:04:44 +0000]
mISDN: Add watchdog functionality to hfcmulti driver

This patch was made by Titus Moldovan and provides IOCTL functions for enabling
and disabling the controller's built in watchdog. The use is optional.

Signed-off-by: Andreas Eversberg <andreas@eversberg.eu>
Signed-off-by: Karsten Keil <keil@b1-systems.de>
Signed-off-by: David S. Miller <davem@davemloft.net>

10 years agogianfar: fix BUG under load after introduction of skb recycling
Lennert Buytenhek [Mon, 25 May 2009 07:42:34 +0000]
gianfar: fix BUG under load after introduction of skb recycling

Since commit 0fd56bb5be6455d0d42241e65aed057244665e5e ("gianfar:
Add support for skb recycling"), gianfar puts skbuffs that are in
the rx ring back onto the recycle list as-is in case there was a
receive error, but this breaks the following invariant: that all
skbuffs on the recycle list have skb->data = skb->head + NET_SKB_PAD.

The RXBUF_ALIGNMENT realignment done in gfar_new_skb() will be done
twice on skbuffs recycled in this way, causing there not to be enough
room in the skb anymore to receive a full packet, eventually leading
to an skb_over_panic from gfar_clean_rx_ring() -> skb_put().

Resetting the skb->data pointer to skb->head + NET_SKB_PAD before
putting the skb back onto the recycle list restores the mentioned
invariant, and should fix this issue.

Reported-by: Michael Guntsche <mike@it-loops.com>
Tested-by: Michael Guntsche <mike@it-loops.com>
Signed-off-by: Lennert Buytenhek <buytenh@wantstofly.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

10 years agoskbuff: Copy csum instead of csum_start/csum_offset
Herbert Xu [Fri, 22 May 2009 22:20:02 +0000]
skbuff: Copy csum instead of csum_start/csum_offset

Hi:

skbuff: Copy csum instead of csum_start/csum_offset

It's easier to copy the u32 csum instead of its two u16
constituents.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

Cheers,
Signed-off-by: David S. Miller <davem@davemloft.net>

10 years agoskbuff: Move new code into __copy_skb_header
Herbert Xu [Fri, 22 May 2009 22:11:37 +0000]
skbuff: Move new code into __copy_skb_header

Hi:

skbuff: Move new __skb_clone code into __copy_skb_header

It seems that people just keep on adding stuff to __skb_clone
instead __copy_skb_header.  This is wrong as it means your brand-new
attributes won't always get copied as you intended.

This patch moves them to the right place, and adds a comment to
prevent this from happening again.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

Thanks,
Signed-off-by: David S. Miller <davem@davemloft.net>

10 years agoMerge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
David S. Miller [Mon, 25 May 2009 07:38:24 +0000]
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless-next-2.6

10 years agomyri10ge: Add support for vlan_features
Brice Goglin [Sun, 24 May 2009 05:27:59 +0000]
myri10ge: Add support for vlan_features

Add support for netdev->vlan_features in the myri10ge driver.

Signed-off-by: Brice Goglin <brice@myri.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

10 years agomyri10ge: drop myri10ge_lro module parameter
Brice Goglin [Sun, 24 May 2009 05:27:51 +0000]
myri10ge: drop myri10ge_lro module parameter

Drop the myri10ge_lro module parameter now that we have ethtool
to enable/disable LRO in the myri10ge driver.

Signed-off-by: Brice Goglin <brice@myri.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

10 years agomyri10ge: fix the invokation of lro_flush_all
Brice Goglin [Sun, 24 May 2009 05:27:41 +0000]
myri10ge: fix the invokation of lro_flush_all

Fix the way we check whether lro_flush_all should be called
in the myri10ge driver.

Signed-off-by: Brice Goglin <brice@myri.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

10 years agomlx4_en: Fix partial rings feature
Yevgeny Petrilin [Sun, 24 May 2009 03:17:11 +0000]
mlx4_en: Fix partial rings feature

In case of allocation failure, the actual ring size is rounded down to
nearest power of 2. The remaining descriptors are freed.
The CQ and SRQ are allocated with the actual size and the mask is updated.

Signed-off-by: Yevgeny Petrilin <yevgenyp@mellanox.co.il>
Signed-off-by: David S. Miller <davem@davemloft.net>

10 years agomlx4_en: Removed redundant stride variable
Yevgeny Petrilin [Sun, 24 May 2009 03:16:51 +0000]
mlx4_en: Removed redundant stride variable

Signed-off-by: Yevgeny Petrilin <yevgenyp@mellanox.co.il>
Signed-off-by: David S. Miller <davem@davemloft.net>

10 years agoiwlwifi: check for valid band for channel info
Wey-Yi Guy [Fri, 22 May 2009 18:01:55 +0000]
iwlwifi: check for valid band for channel info

when display channel info in debugfs, always check for valid band
before access the pointer and display information

for 1000 NIC, it only support "bgn" mode, so there is no 5.2GHz channels
available to display.

Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

10 years agoiwlagn: co-exist with AMT
Mohamed Abbas [Fri, 22 May 2009 18:01:54 +0000]
iwlagn: co-exist with AMT

Enable using iwlwifi driver in AMT system.

Signed-off-by: Mohamed Abbas <mohamed.abbas@intel.com>
Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

10 years agoiwlcore: Set rb_timeout to 0x10 for devices with ICT
Mohamed Abbas [Fri, 22 May 2009 18:01:53 +0000]
iwlcore: Set rb_timeout to 0x10 for devices with ICT

rb value should be 0x10 for devices using ICT.
 RX interrupt was not performing well with
 0 value

Signed-off-by: Mohamed Abbas <mohamed.abbas@intel.com>
Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

10 years agoiwlcore: Add support for periodic RX interrupt
Mohamed Abbas [Fri, 22 May 2009 18:01:52 +0000]
iwlcore: Add support for periodic RX interrupt

Periodic RX interrupt needed with ICT interrupt to prevent RX race.
Sending RX interrupt require many steps to be done in the
the device:
 1- write interrupt to current index in ICT table.
 2- dma RX frame.
 3- update RX shared data to indicate last write index.
 4- send interrupt.
This could lead to RX race, driver could receive RX interrupt
but the shared data changes does not reflect that.
this could lead to RX race, RX periodic will solve this race

Signed-off-by: Mohamed Abbas <mohamed.abbas@intel.com>
Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

10 years agoiwlcore: Allow skb allocation from tasklet.
Mohamed Abbas [Fri, 22 May 2009 18:01:51 +0000]
iwlcore: Allow skb allocation from tasklet.

If RX queue becomes empty then we need to restock the queue from tasklet to prevent
ucode from starving. A caller to iwl_rx_allocate will decide if allocated buffer should
come from GFP_ATOMIC or GFP_KERNEL.

Signed-off-by: Mohamed Abbas <mohamed.abbas@intel.com>
Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

10 years agoiwlcore: support ICT interrupt
Mohamed Abbas [Fri, 22 May 2009 18:01:50 +0000]
iwlcore: support ICT interrupt

Add ICT interrupt handler support, ICT should improve CPU utilization
 since it does not require target read which is very expensive. This
 interrupt handler only added to 5000 cards and newer. Device will write
 interrupts to ICT shared table to inform driver about its interrupts.

These patches will not touch 3945 and 4965 interrupt handlers and tasklet.

Signed-off-by: Mohamed Abbas <mohamed.abbas@intel.com>
Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

10 years agoiwlwifi: support "pure 40MHz" in RXON command
Wey-Yi Guy [Fri, 22 May 2009 18:01:49 +0000]
iwlwifi: support "pure 40MHz" in RXON command

Fix the bug when using 11n "pure 40MHz" mode cause uCode
crashing by adding support for "pure 40MHz" in RX_ON command flag.
the "mode" field (bits 25:26) has value of 0-3
    0 = 20 MHz only
    1 = 40MHz only
    2 = Mixed
    3 = Reserved
Control Channel ID (bit 22) is valid only in Mixed mode.

Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

10 years agoiwlwifi: report the rate index as an MCS rate number
Wey-Yi Guy [Fri, 22 May 2009 18:01:48 +0000]
iwlwifi: report the rate index as an MCS rate number

If transmit in HT rate, report the rate index as an MCS rate number
instead of an index. so "iw" can display correct BitRate

Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

10 years agoiwlcore: register locks
Mohamed Abbas [Fri, 22 May 2009 18:01:47 +0000]
iwlcore: register locks

Add new lock to be used when accessing some registers. Also move
    the register lock and iwl_grab_nic_access inside the function for register access. This
    will prevent from forgetting to hold locks and nic access in the right way and make code
    easier to maintain.

    We over use the priv->lock spin lock and I guess we need to add new
    one for Tx queue after that we might need to change most of these lock to
    BH and just keep priv->lock as irq type.

Signed-off-by: Mohamed Abbas <mohamed.abbas@intel.com>
Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

10 years agoiwlwifi: support NVM access (EEPROM/OTP)
Wey-Yi Guy [Fri, 22 May 2009 18:01:46 +0000]
iwlwifi: support NVM access (EEPROM/OTP)

Two type of NVM available for devices 1000, 6000 and after, adding
support to read OTP lower blocks if OTP is used instead of EEPROM.

Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

10 years agort2x00: Remove usage of IEEE80211_CONF_CHANGE_BEACON_INTERVAL
Ivo van Doorn [Thu, 21 May 2009 17:16:46 +0000]
rt2x00: Remove usage of IEEE80211_CONF_CHANGE_BEACON_INTERVAL

IEEE80211_CONF_CHANGE_BEACON_INTERVAL was deprecated a month ago,
it is about time to remove all usage from the rt2x00 drivers and
use the correct beacon interval configuration through the bss_info
structure.

Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

10 years agort2x00: Add new rt2800usb USB ID's for Sweex
Ivo van Doorn [Thu, 21 May 2009 17:16:14 +0000]
rt2x00: Add new rt2800usb USB ID's for Sweex

The USB ID with unknown manufacturer is apparently sweex,
copy it to the correct location of the list and add 2
additional USB ID's also belonging to Sweex.

Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

10 years agorndis_wlan: do not try to restore wpa keys using add_wep_key()
Jussi Kivilinna [Fri, 22 May 2009 14:40:34 +0000]
rndis_wlan: do not try to restore wpa keys using add_wep_key()

set_infra_mode() tried to restore wpa keys using add_wep_key(). This never
worked so prevent driver from trying.

Signed-off-by: Jussi Kivilinna <jussi.kivilinna@mbnet.fi>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

10 years agorndis_wlan: split add_wpa_key from rndis_iw_set_encode_ext
Jussi Kivilinna [Fri, 22 May 2009 14:40:27 +0000]
rndis_wlan: split add_wpa_key from rndis_iw_set_encode_ext

Split add_wpa_key() from rndis_iw_set_encode_ext so that conversion to cfg80211
would be easier later on.

Signed-off-by: Jussi Kivilinna <jussi.kivilinna@mbnet.fi>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

10 years agorndis_wlan: explain bits used in key setup code.
Jussi Kivilinna [Fri, 22 May 2009 14:40:20 +0000]
rndis_wlan: explain bits used in key setup code.

Driver uses some unnamed bits to control encryption setup. Move these to
enumerations with proper names explaining their meaning.

Signed-off-by: Jussi Kivilinna <jussi.kivilinna@mbnet.fi>
Signed-off-by: John W. Linville <linville@tuxdriver.com>