diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-25 13:25:22 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-25 13:25:22 +0200 |
| commit | 8a9ea3237e7eb5c25f09e429ad242ae5a3d5ea22 (patch) | |
| tree | a0a63398a9983667d52cbbbf4e2405b4f22b1d83 /drivers/net | |
| parent | 1be025d3cb40cd295123af2c394f7229ef9b30ca (diff) | |
| parent | 8b3408f8ee994973869d8ba32c5bf482bc4ddca4 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next: (1745 commits)
dp83640: free packet queues on remove
dp83640: use proper function to free transmit time stamping packets
ipv6: Do not use routes from locally generated RAs
|PATCH net-next] tg3: add tx_dropped counter
be2net: don't create multiple RX/TX rings in multi channel mode
be2net: don't create multiple TXQs in BE2
be2net: refactor VF setup/teardown code into be_vf_setup/clear()
be2net: add vlan/rx-mode/flow-control config to be_setup()
net_sched: cls_flow: use skb_header_pointer()
ipv4: avoid useless call of the function check_peer_pmtu
TCP: remove TCP_DEBUG
net: Fix driver name for mdio-gpio.c
ipv4: tcp: fix TOS value in ACK messages sent from TIME_WAIT
rtnetlink: Add missing manual netlink notification in dev_change_net_namespaces
ipv4: fix ipsec forward performance regression
jme: fix irq storm after suspend/resume
route: fix ICMP redirect validation
net: hold sock reference while processing tx timestamps
tcp: md5: add more const attributes
Add ethtool -g support to virtio_net
...
Fix up conflicts in:
- drivers/net/Kconfig:
The split-up generated a trivial conflict with removal of a
stale reference to Documentation/networking/net-modules.txt.
Remove it from the new location instead.
- fs/sysfs/dir.c:
Fairly nasty conflicts with the sysfs rb-tree usage, conflicting
with Eric Biederman's changes for tagged directories.
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/Kconfig | 3389 | ||||
| -rw-r--r-- | drivers/net/Makefile | 326 | ||||
| -rw-r--r-- | drivers/net/appletalk/cops.c | 2 | ||||
| -rw-r--r-- | drivers/net/appletalk/ltpc.c | 2 | ||||
| -rw-r--r-- | drivers/net/arcnet/Kconfig | 14 | ||||
| -rw-r--r-- | drivers/net/arcnet/Makefile | 1 | ||||
| -rw-r--r-- | drivers/net/arcnet/com20020.c | 2 | ||||
| -rw-r--r-- | drivers/net/arcnet/com20020_cs.c (renamed from drivers/net/pcmcia/com20020_cs.c) | 0 | ||||
| -rw-r--r-- | drivers/net/arm/Kconfig | 74 | ||||
| -rw-r--r-- | drivers/net/arm/Makefile | 14 | ||||
| -rw-r--r-- | drivers/net/benet/Kconfig | 6 | ||||
| -rw-r--r-- | drivers/net/bna/bfa_ioc_ct.c | 516 | ||||
| -rw-r--r-- | drivers/net/bna/bfi_ctreg.h | 646 | ||||
| -rw-r--r-- | drivers/net/bna/bfi_ll.h | 438 | ||||
| -rw-r--r-- | drivers/net/bna/bna_ctrl.c | 3076 | ||||
| -rw-r--r-- | drivers/net/bna/bna_hw.h | 1490 | ||||
| -rw-r--r-- | drivers/net/bna/bna_txrx.c | 4185 | ||||
| -rw-r--r-- | drivers/net/bonding/bond_3ad.c | 7 | ||||
| -rw-r--r-- | drivers/net/bonding/bond_main.c | 75 | ||||
| -rw-r--r-- | drivers/net/bonding/bond_sysfs.c | 46 | ||||
| -rw-r--r-- | drivers/net/bonding/bonding.h | 8 | ||||
| -rw-r--r-- | drivers/net/caif/caif_hsi.c | 436 | ||||
| -rw-r--r-- | drivers/net/caif/caif_spi.c | 4 | ||||
| -rw-r--r-- | drivers/net/can/at91_can.c | 2 | ||||
| -rw-r--r-- | drivers/net/can/dev.c | 14 | ||||
| -rw-r--r-- | drivers/net/can/flexcan.c | 189 | ||||
| -rw-r--r-- | drivers/net/can/mscan/mscan.c | 26 | ||||
| -rw-r--r-- | drivers/net/can/sja1000/Kconfig | 14 | ||||
| -rw-r--r-- | drivers/net/can/sja1000/Makefile | 2 | ||||
| -rw-r--r-- | drivers/net/can/sja1000/ems_pcmcia.c | 331 | ||||
| -rw-r--r-- | drivers/net/can/sja1000/peak_pci.c | 291 | ||||
| -rw-r--r-- | drivers/net/can/sja1000/sja1000.c | 2 | ||||
| -rw-r--r-- | drivers/net/can/sja1000/sja1000.h | 2 | ||||
| -rw-r--r-- | drivers/net/can/slcan.c | 2 | ||||
| -rw-r--r-- | drivers/net/can/vcan.c | 2 | ||||
| -rw-r--r-- | drivers/net/cris/eth_v10.c | 2 | ||||
| -rw-r--r-- | drivers/net/dummy.c | 2 | ||||
| -rw-r--r-- | drivers/net/ethernet/3com/3c501.c (renamed from drivers/net/3c501.c) | 2 | ||||
| -rw-r--r-- | drivers/net/ethernet/3com/3c501.h (renamed from drivers/net/3c501.h) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/3com/3c509.c (renamed from drivers/net/3c509.c) | 2 | ||||
| -rw-r--r-- | drivers/net/ethernet/3com/3c515.c (renamed from drivers/net/3c515.c) | 2 | ||||
| -rw-r--r-- | drivers/net/ethernet/3com/3c574_cs.c (renamed from drivers/net/pcmcia/3c574_cs.c) | 2 | ||||
| -rw-r--r-- | drivers/net/ethernet/3com/3c589_cs.c (renamed from drivers/net/pcmcia/3c589_cs.c) | 2 | ||||
| -rw-r--r-- | drivers/net/ethernet/3com/3c59x.c (renamed from drivers/net/3c59x.c) | 15 | ||||
| -rw-r--r-- | drivers/net/ethernet/3com/Kconfig | 122 | ||||
| -rw-r--r-- | drivers/net/ethernet/3com/Makefile | 11 | ||||
| -rw-r--r-- | drivers/net/ethernet/3com/typhoon.c (renamed from drivers/net/typhoon.c) | 15 | ||||
| -rw-r--r-- | drivers/net/ethernet/3com/typhoon.h (renamed from drivers/net/typhoon.h) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/8390/3c503.c (renamed from drivers/net/3c503.c) | 2 | ||||
| -rw-r--r-- | drivers/net/ethernet/8390/3c503.h (renamed from drivers/net/3c503.h) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/8390/8390.c (renamed from drivers/net/8390.c) | 2 | ||||
| -rw-r--r-- | drivers/net/ethernet/8390/8390.h (renamed from drivers/net/8390.h) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/8390/8390p.c (renamed from drivers/net/8390p.c) | 2 | ||||
| -rw-r--r-- | drivers/net/ethernet/8390/Kconfig | 337 | ||||
| -rw-r--r-- | drivers/net/ethernet/8390/Makefile | 29 | ||||
| -rw-r--r-- | drivers/net/ethernet/8390/ac3200.c (renamed from drivers/net/ac3200.c) | 2 | ||||
| -rw-r--r-- | drivers/net/ethernet/8390/apne.c (renamed from drivers/net/apne.c) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/8390/ax88796.c (renamed from drivers/net/ax88796.c) | 2 | ||||
| -rw-r--r-- | drivers/net/ethernet/8390/axnet_cs.c (renamed from drivers/net/pcmcia/axnet_cs.c) | 4 | ||||
| -rw-r--r-- | drivers/net/ethernet/8390/e2100.c (renamed from drivers/net/e2100.c) | 2 | ||||
| -rw-r--r-- | drivers/net/ethernet/8390/es3210.c (renamed from drivers/net/es3210.c) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/8390/etherh.c (renamed from drivers/net/arm/etherh.c) | 4 | ||||
| -rw-r--r-- | drivers/net/ethernet/8390/hp-plus.c (renamed from drivers/net/hp-plus.c) | 2 | ||||
| -rw-r--r-- | drivers/net/ethernet/8390/hp.c (renamed from drivers/net/hp.c) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/8390/hydra.c (renamed from drivers/net/hydra.c) | 2 | ||||
| -rw-r--r-- | drivers/net/ethernet/8390/lib8390.c (renamed from drivers/net/lib8390.c) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/8390/lne390.c (renamed from drivers/net/lne390.c) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/8390/mac8390.c (renamed from drivers/net/mac8390.c) | 2 | ||||
| -rw-r--r-- | drivers/net/ethernet/8390/ne-h8300.c (renamed from drivers/net/ne-h8300.c) | 2 | ||||
| -rw-r--r-- | drivers/net/ethernet/8390/ne.c (renamed from drivers/net/ne.c) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/8390/ne2.c (renamed from drivers/net/ne2.c) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/8390/ne2k-pci.c (renamed from drivers/net/ne2k-pci.c) | 2 | ||||
| -rw-r--r-- | drivers/net/ethernet/8390/ne3210.c (renamed from drivers/net/ne3210.c) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/8390/pcnet_cs.c (renamed from drivers/net/pcmcia/pcnet_cs.c) | 4 | ||||
| -rw-r--r-- | drivers/net/ethernet/8390/smc-mca.c (renamed from drivers/net/smc-mca.c) | 2 | ||||
| -rw-r--r-- | drivers/net/ethernet/8390/smc-ultra.c (renamed from drivers/net/smc-ultra.c) | 2 | ||||
| -rw-r--r-- | drivers/net/ethernet/8390/smc-ultra32.c (renamed from drivers/net/smc-ultra32.c) | 2 | ||||
| -rw-r--r-- | drivers/net/ethernet/8390/stnic.c (renamed from drivers/net/stnic.c) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/8390/wd.c (renamed from drivers/net/wd.c) | 2 | ||||
| -rw-r--r-- | drivers/net/ethernet/8390/zorro8390.c (renamed from drivers/net/zorro8390.c) | 2 | ||||
| -rw-r--r-- | drivers/net/ethernet/Kconfig | 177 | ||||
| -rw-r--r-- | drivers/net/ethernet/Makefile | 74 | ||||
| -rw-r--r-- | drivers/net/ethernet/adaptec/Kconfig | 36 | ||||
| -rw-r--r-- | drivers/net/ethernet/adaptec/Makefile | 5 | ||||
| -rw-r--r-- | drivers/net/ethernet/adaptec/starfire.c (renamed from drivers/net/starfire.c) | 13 | ||||
| -rw-r--r-- | drivers/net/ethernet/adi/Kconfig | 69 | ||||
| -rw-r--r-- | drivers/net/ethernet/adi/Makefile | 5 | ||||
| -rw-r--r-- | drivers/net/ethernet/adi/bfin_mac.c (renamed from drivers/net/bfin_mac.c) | 2 | ||||
| -rw-r--r-- | drivers/net/ethernet/adi/bfin_mac.h (renamed from drivers/net/bfin_mac.h) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/aeroflex/Kconfig | 11 | ||||
| -rw-r--r-- | drivers/net/ethernet/aeroflex/Makefile | 5 | ||||
| -rw-r--r-- | drivers/net/ethernet/aeroflex/greth.c (renamed from drivers/net/greth.c) | 20 | ||||
| -rw-r--r-- | drivers/net/ethernet/aeroflex/greth.h (renamed from drivers/net/greth.h) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/alteon/Kconfig | 48 | ||||
| -rw-r--r-- | drivers/net/ethernet/alteon/Makefile | 5 | ||||
| -rw-r--r-- | drivers/net/ethernet/alteon/acenic.c (renamed from drivers/net/acenic.c) | 16 | ||||
| -rw-r--r-- | drivers/net/ethernet/alteon/acenic.h (renamed from drivers/net/acenic.h) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/amd/7990.c (renamed from drivers/net/7990.c) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/amd/7990.h (renamed from drivers/net/7990.h) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/amd/Kconfig | 195 | ||||
| -rw-r--r-- | drivers/net/ethernet/amd/Makefile | 20 | ||||
| -rw-r--r-- | drivers/net/ethernet/amd/a2065.c (renamed from drivers/net/a2065.c) | 2 | ||||
| -rw-r--r-- | drivers/net/ethernet/amd/a2065.h (renamed from drivers/net/a2065.h) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/amd/am79c961a.c (renamed from drivers/net/arm/am79c961a.c) | 2 | ||||
| -rw-r--r-- | drivers/net/ethernet/amd/am79c961a.h (renamed from drivers/net/arm/am79c961a.h) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/amd/amd8111e.c (renamed from drivers/net/amd8111e.c) | 2 | ||||
| -rw-r--r-- | drivers/net/ethernet/amd/amd8111e.h (renamed from drivers/net/amd8111e.h) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/amd/ariadne.c (renamed from drivers/net/ariadne.c) | 2 | ||||
| -rw-r--r-- | drivers/net/ethernet/amd/ariadne.h (renamed from drivers/net/ariadne.h) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/amd/atarilance.c (renamed from drivers/net/atarilance.c) | 2 | ||||
| -rw-r--r-- | drivers/net/ethernet/amd/au1000_eth.c (renamed from drivers/net/au1000_eth.c) | 2 | ||||
| -rw-r--r-- | drivers/net/ethernet/amd/au1000_eth.h (renamed from drivers/net/au1000_eth.h) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/amd/declance.c (renamed from drivers/net/declance.c) | 2 | ||||
| -rw-r--r-- | drivers/net/ethernet/amd/depca.c (renamed from drivers/net/depca.c) | 2 | ||||
| -rw-r--r-- | drivers/net/ethernet/amd/depca.h (renamed from drivers/net/depca.h) | 2 | ||||
| -rw-r--r-- | drivers/net/ethernet/amd/hplance.c (renamed from drivers/net/hplance.c) | 2 | ||||
| -rw-r--r-- | drivers/net/ethernet/amd/hplance.h (renamed from drivers/net/hplance.h) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/amd/lance.c (renamed from drivers/net/lance.c) | 2 | ||||
| -rw-r--r-- | drivers/net/ethernet/amd/mvme147.c (renamed from drivers/net/mvme147.c) | 2 | ||||
| -rw-r--r-- | drivers/net/ethernet/amd/ni65.c (renamed from drivers/net/ni65.c) | 2 | ||||
| -rw-r--r-- | drivers/net/ethernet/amd/ni65.h (renamed from drivers/net/ni65.h) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/amd/nmclan_cs.c (renamed from drivers/net/pcmcia/nmclan_cs.c) | 2 | ||||
| -rw-r--r-- | drivers/net/ethernet/amd/pcnet32.c (renamed from drivers/net/pcnet32.c) | 204 | ||||
| -rw-r--r-- | drivers/net/ethernet/amd/sun3lance.c (renamed from drivers/net/sun3lance.c) | 2 | ||||
| -rw-r--r-- | drivers/net/ethernet/amd/sunlance.c (renamed from drivers/net/sunlance.c) | 2 | ||||
| -rw-r--r-- | drivers/net/ethernet/apple/Kconfig | 77 | ||||
| -rw-r--r-- |