aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2010-05-06netpoll: add generic support for bridge and bonding devicesWANG Cong6-11/+39
This whole patchset is for adding netpoll support to bridge and bonding devices. I already tested it for bridge, bonding, bridge over bonding, and bonding over bridge. It looks fine now. To make bridge and bonding support netpoll, we need to adjust some netpoll generic code. This patch does the following things: 1) introduce two new priv_flags for struct net_device: IFF_IN_NETPOLL which identifies we are processing a netpoll; IFF_DISABLE_NETPOLL is used to disable netpoll support for a device at run-time; 2) introduce one new method for netdev_ops: ->ndo_netpoll_cleanup() is used to clean up netpoll when a device is removed. 3) introduce netpoll_poll_dev() which takes a struct net_device * parameter; export netpoll_send_skb() and netpoll_poll_dev() which will be used later; 4) hide a pointer to struct netpoll in struct netpoll_info, ditto. 5) introduce ->real_dev for struct netpoll. 6) introduce a new status NETDEV_BONDING_DESLAE, which is used to disable netconsole before releasing a slave, to avoid deadlocks. Cc: David Miller <[email protected]> Cc: Neil Horman <[email protected]> Signed-off-by: WANG Cong <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2010-05-06ixgbevf: Cache PF ack bit in interruptGreg Rose1-0/+16
When the PF acks a message from the VF the VF gets an interrupt. It must cache the ack bit so that polling SW will not miss the ack. Also avoid reading the message buffer on acks because that also will clear the ack bit. Signed-off-by: Greg Rose <[email protected]> Signed-off-by: Jeff Kirsher <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2010-05-06ixgbe: Streamline MC filter setup for VFsGreg Rose1-2/+11
The driver was calling the set Rx mode function for every multicast filter set by the VF. When starting many VMs where each might have multiple VLAN interfaces this would result in the function being called hundreds or even thousands of times. This is unnecessary for the case of the imperfect filters used in the MTA and has been streamlined to be more efficient. Signed-off-by: Greg Rose <[email protected]> Signed-off-by: Jeff Kirsher <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2010-05-06ixgbe: Remove unneeded register writes in VF VLAN setupGreg Rose1-11/+0
The driver is unnecessarily writing values to VLAN control registers. These writes already done elsewhere and are superfluous here. Signed-off-by: Greg Rose <[email protected]> Signed-off-by: Jeff Kirsher <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2010-05-06Merge branch 'vhost' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhostDavid S. Miller3-8/+53
2010-05-05igb: reduce cache misses on tx cleanupNick Nunley2-27/+22
This patch reduces the number of skb cache misses in the clean_tx_irq path, and results in an overall increase in tx packet throughput. Signed-off-by: Nicholas Nunley <[email protected]> Signed-off-by: Jeff Kirsher <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2010-05-05ks8851: companion eeprom access through ethtoolSebastien Jan1-0/+114
Accessing ks8851 companion eeprom permits modifying the ks8851 stored MAC address. Example how to change the MAC address using ethtool, to set the 01:23:45:67:89:AB MAC address: $ echo "0:AB8976452301" | xxd -r > mac.bin $ sudo ethtool -E eth0 magic 0x8870 offset 2 < mac.bin Signed-off-by: Sebastien Jan <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2010-05-05ks8851: Low level functions for read/write to companion eepromSebastien Jan2-1/+241
Low-level functions provide 16bits words read and write capability to ks8851 companion eeprom. Signed-off-by: Sebastien Jan <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2010-05-05ks8851: Add caching of CCR registerSebastien Jan1-0/+12
CCR register contains information on companion eeprom availability. Signed-off-by: Sebastien Jan <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2010-05-05forcedeth: Account for consumed budget in napi pollTom Herbert1-2/+3
Repeated calls to nv_rx_process in napi poll routine do not take portion of budget that has been consumed in previous calls. Fix by subtracting the number of packets processed. Signed-off-by: Tom Herbert <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2010-05-05netdev: octeon_mgmt: Remove some gratuitous blank lines.David Daney1-7/+0
Signed-off-by: David Daney <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2010-05-05netdev: octeon_mgmt: Try not to drop TX packets when stopping the queue.David Daney1-5/+11
Stop the queue when we add the packet that will fill it instead of dropping the packet Signed-off-by: David Daney <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2010-05-05netdev: octeon_mgmt: Free TX skbufs in a timely manner.David Daney1-3/+2
We also reduce the high water mark to 1 so skbufs are not stranded for long periods of time. Since we are cleaning after each packet, no need to do it in the transmit path. Signed-off-by: David Daney <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2010-05-05netdev: octeon_mgmt: Fix race manipulating irq bits.David Daney1-2/+1
Don't re-read the interrupt status register, clear the exact bits we will be testing. Signed-off-by: David Daney <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2010-05-05netdev: octeon_mgmt: Fix race condition freeing TX buffers.David Daney1-2/+9
Under heavy load the TX cleanup tasklet and xmit threads would race and try to free too many buffers. Signed-off-by: David Daney <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2010-05-05netdev: octeon_mgmt: Use proper MAC addresses.David Daney1-10/+5
The original implementation incorrectly uses netdev->dev_addrs. Use netdev->uc instead. Also use netdev_for_each_uc_addr to iterate over the addresses. Fix comment. Signed-off-by: David Daney <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2010-05-05ixgbe: Add support for VF MAC and VLAN configurationGreg Rose5-4/+118
Add support for the "ip link set" and "ip link show" commands that allow configuration of the virtual functions' MAC and port VLAN via user space command line. Signed-off-by: Greg Rose <[email protected]> Signed-off-by: Jeff Kirsher <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2010-05-05ixgbe: Add boolean parameter to ixgbe_set_vmolrGreg Rose3-6/+9
Add a boolean parameter to ixgbe-set_vmolr so that the caller can specify whether the pool should accept untagged packets. Required for a follow on patch to enable administrative configuration of port VLAN for virtual functions. Signed-off-by: Greg Rose <[email protected]> Signed-off-by: Jeff Kirsher <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2010-05-05e1000/e1000e: implement a simple interrupt moderationJesse Brandeburg6-10/+57
Back before e1000-7.3.20, the e1000 driver had a simple algorithm that managed interrupt moderation. The driver was updated in 7.3.20 to have the new "adaptive" interrupt moderation but we have customer requests to redeploy the old way as an option. This patch adds the old functionality back. The new functionality can be enabled via module parameter or at runtime via ethtool. Module parameter: (InterruptThrottleRate=4) to use this new moderation method. Ethtool method: ethtool -C ethX rx-usecs 4 Signed-off-by: Jesse Brandeburg <[email protected]> Signed-off-by: Jeff Kirsher <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2010-05-05e1000e: increase rx fifo size to 36K on 82574 and 82583Alexander Duyck1-2/+2
This change increases the RX fifo size to 36K for standard frames and decreases the TX fifo size to 4K. The reason for this change is that on slower systems the RX is much more likely to backfill and need space than the TX is. As long as the TX fifo is twice the size of the MTU we should have more than enough TX fifo. Signed-off-by: Alexander Duyck <[email protected]> Signed-off-by: Jeff Kirsher <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2010-05-05e1000e: Save irq into netdev structureTom Herbert1-0/+2
Set net->devirq to pdev->irq. This should be consistent with other drivers. Signed-off-by: Tom Herbert <[email protected]> Acked-by: Bruce Allan <[email protected]> Signed-off-by: Jeff Kirsher <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2010-05-05e1000e: Remove unnessary log messageTom Herbert1-1/+0
Remove e_info message printed whenever TSO is enabled or disabled. This is not very useful and just clutters dmesg. Signed-off-by: Tom Herbert <[email protected]> Acked-by: Bruce Allan <[email protected]> Signed-off-by: Jeff Kirsher <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2010-05-05e1000e: reduce writes of RX producer ptrTom Herbert1-34/+23
Reduce number of writes to RX producer pointer. When alloc'ing RX buffers, only write the RX producer pointer once every E1000_RX_BUFFER_WRITE (16) buffers created. Signed-off-by: Tom Herbert <[email protected]> Acked-by: Bruce Allan <[email protected]> Signed-off-by: Jeff Kirsher <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2010-05-05e1000e: save skb counts in TX to avoid cache missesTom Herbert2-9/+11
In e1000_tx_map, precompute number of segements and bytecounts which are derived from fields in skb; these are stored in buffer_info. When cleaning tx in e1000_clean_tx_irq use the values in the associated buffer_info for statistics counting, this eliminates cache misses on skb fields. Signed-off-by: Tom Herbert <[email protected]> Acked-by: Bruce Allan <[email protected]> Signed-off-by: Jeff Kirsher <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2010-05-05bnx2x: Fix check to get RX hashTom Herbert1-1/+1
Flag used in check to get rxhash out of the descriptor is incorrect one. Fix to use the proper features flag. Signed-off-by: Tom Herbert <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2010-05-05Merge branch 'for-davem' of ↵David S. Miller140-1368/+4751
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
2010-05-05Merge branch 'master' of ↵John W. Linville140-1368/+4751
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem Conflicts: drivers/net/wireless/libertas_tf/cmd.c drivers/net/wireless/libertas_tf/main.c
2010-05-05mac80211: use fixed channel in ibss join when appropriateJohannes Berg1-0/+6
"mac80211: improve IBSS scanning" was missing a hunk. This adds that hunk as originally intended. Signed-off-by: Johannes Berg <[email protected]> Signed-off-by: John W. Linville <[email protected]>
2010-05-05rtl8187: use SET_IEEE80211_PERM_ADDRJohn W. Linville1-4/+6
Signed-off-by: John W. Linville <[email protected]> Acked-by: Hin-Tak Leung <[email protected]>
2010-05-05net: __alloc_skb() speedupEric Dumazet2-17/+11
With following patch I can reach maximum rate of my pktgen+udpsink simulator : - 'old' machine : dual quad core E5450 @3.00GHz - 64 UDP rx flows (only differ by destination port) - RPS enabled, NIC interrupts serviced on cpu0 - rps dispatched on 7 other cores. (~130.000 IPI per second) - SLAB allocator (faster than SLUB in this workload) - tg3 NIC - 1.080.000 pps without a single drop at NIC level. Idea is to add two prefetchw() calls in __alloc_skb(), one to prefetch first sk_buff cache line, the second to prefetch the shinfo part. Also using one memset() to initialize all skb_shared_info fields instead of one by one to reduce number of instructions, using long word moves. All skb_shared_info fields before 'dataref' are cleared in __alloc_skb(). Signed-off-by: Eric Dumazet <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2010-05-05pppoe: remove unnecessary checks in pppoe_flush_devJiri Pirko1-6/+0
pernet memory is guaranteed to exist when notifiers are called. Signed-off-by: Jiri Pirko <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2010-05-04rtl8180: use SET_IEEE80211_PERM_ADDRJohn W. Linville1-4/+6
Signed-off-by: John W. Linville <[email protected]>
2010-05-04rt2x00: Register frame length in TX entry descriptor instead of L2PAD.Gertjan van Wingerde9-15/+14
And use it consistently in the chipset drivers. Preparation for further clean ups. Signed-off-by: Gertjan van Wingerde <[email protected]> Signed-off-by: John W. Linville <[email protected]>
2010-05-04rt2x00: Fix HT40+/HT40- setting in rt2800.Gertjan van Wingerde2-4/+4
Inspection of the Ralink vendor driver shows that the TX_BAND_CFG register and BBP register 3 are about HT40- indication, not about HT40+ indication. Inverse the meaning of these fields in the code. Signed-off-by: Gertjan van Wingerde <[email protected]> Signed-off-by: John W. Linville <[email protected]>
2010-05-04rt2x00: Enable RT30xx by default.Gertjan van Wingerde1-2/+2
Now that RT30xx support is at the same level as RT28xx support we can enable these devices by default. Signed-off-by: Gertjan van Wingerde <[email protected]> Signed-off-by: John W. Linville <[email protected]>
2010-05-04rt2x00: Remove rt2x00pci.h include from rt2800lib.Gertjan van Wingerde1-3/+0
PCI specific code has been remove quite some time ago. Signed-off-by: Gertjan van Wingerde <[email protected]> Signed-off-by: John W. Linville <[email protected]>
2010-05-04iwlwifi: recalculate average tpt if not currentReinette Chatre1-4/+6
We currently have this check as a BUG_ON, which is being hit by people. Previously it was an error with a recalculation if not current, return that code. The BUG_ON was introduced by: commit 3110bef78cb4282c58245bc8fd6d95d9ccb19749 Author: Guy Cohen <[email protected]> Date: Tue Sep 9 10:54:54 2008 +0800 iwlwifi: Added support for 3 antennas ... the portion adding the BUG_ON is reverted since we are encountering the error and BUG_ON was created with assumption that error is not encountered. Signed-off-by: Reinette Chatre <[email protected]> Signed-off-by: John W. Linville <[email protected]>
2010-05-03forcedeth: Kill NAPI config options.David S. Miller2-207/+1
All distributions enable it, therefore no significant body of users are even testing the driver with it disabled. And making NAPI configurable is heavily discouraged anyways. I left the MSI-X interrupt enabling thing in an "#if 0" block so hopefully someone can debug that and it can get re-enabled. Probably it was just one of the NVIDIA chipset MSI erratas that we work handle these days in the PCI quirks (see drivers/pci/quirks.c and stuff like nvenet_msi_disable()). Signed-off-by: David S. Miller <[email protected]>
2010-05-03forcedeth: GRO supportTom Herbert1-5/+8
Add GRO support to forcedeth. Signed-off-by: Tom Herbert <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2010-05-03net: skb_free_datagram_locked() fixEric Dumazet1-2/+7
Commit 4b0b72f7dd617b ( net: speedup udp receive path ) introduced a bug in skb_free_datagram_locked(). We should not skb_orphan() skb if we dont have the guarantee we are the last skb user, this might happen with MSG_PEEK concurrent users. To keep socket locked for the smallest period of time, we split consume_skb() logic, inlined in skb_free_datagram_locked() Reported-by: Stephen Hemminger <[email protected]> Signed-off-by: Eric Dumazet <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2010-05-03Merge branch 'net-next' of ↵David S. Miller16-176/+365
git://git.kernel.org/pub/scm/linux/kernel/git/vxy/lksctp-dev Add missing linux/vmalloc.h include to net/sctp/probe.c Signed-off-by: David S. Miller <[email protected]>
2010-05-03net: rcu fixesEric Dumazet2-8/+37
Add hlist_for_each_entry_rcu_bh() and hlist_for_each_entry_continue_rcu_bh() macros, and use them in ipv6_get_ifaddr(), if6_get_first() and if6_get_next() to fix lockdeps warnings. Signed-off-by: Eric Dumazet <[email protected]> Reviewed-by: "Paul E. McKenney" <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2010-05-03phy/micrel: Add module device ID table for autoloading.David S. Miller1-0/+9
Signed-off-by: David S. Miller <[email protected]>
2010-05-03Merge branch 'master' of ↵David S. Miller5-13/+133
master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
2010-05-03drivers/net/phy: micrel phy driverDavid J. Choi3-0/+110
This is the first version of phy driver from Micrel Inc. Signed-off-by: David J. Choi <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2010-05-03unix/garbage: kill copy of the skb queue walkerIlpo Järvinen1-11/+2
Worse yet, it seems that its arguments were in reverse order. Also remove one related helper which seems hardly worth keeping. Signed-off-by: Ilpo Järvinen <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2010-05-04macvtap: add ioctl to modify vnet header sizeMichael S. Tsirkin1-4/+23
This adds TUNSETVNETHDRSZ/TUNGETVNETHDRSZ support to macvtap. Signed-off-by: Michael S. Tsirkin <[email protected]> Acked-by: Arnd Bergmann <[email protected]> Acked-by: David S. Miller <[email protected]>
2010-05-03dm9601: fix phy/eeprom write routinePeter Korsgaard1-1/+1
Use correct bit positions in DM_SHARED_CTRL register for writes. Michael Planes recently encountered a 'KY-RS9600 USB-LAN converter', which came with a driver CD containing a Linux driver. This driver turns out to be a copy of dm9601.c with symbols renamed and my copyright stripped. That aside, it did contain 1 functional change in dm_write_shared_word(), and after checking the datasheet the original value was indeed wrong (read versus write bits). On Michaels HW, this change bumps receive speed from ~30KB/s to ~900KB/s. On other devices the difference is less spectacular, but still significant (~30%). Reported-by: Michael Planes <[email protected]> CC: [email protected] Signed-off-by: Peter Korsgaard <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2010-05-03Revert "ixgbe: disable MSI-X by default on certain Cisco adapters"David S. Miller2-20/+1
This reverts commit d5ffd75a27fade39ba5df3b07290c5a2c297b9bd. As requested by Jeff Kircher. Signed-off-by: David S. Miller <[email protected]>
2010-05-03ppp_generic: handle non-linear skbs when passing them to pppdSimon Arlott1-1/+4
Frequently when using PPPoE with an interface MTU greater than 1500, the skb is likely to be non-linear. If the skb needs to be passed to pppd then the skb data must be read correctly. The previous commit fixes an issue with accidentally sending skbs to pppd based on an invalid read of the protocol type. When that error occurred pppd was reading invalid skb data too. Signed-off-by: Simon Arlott <[email protected]> Signed-off-by: David S. Miller <[email protected]>