kevin/linux
1
Fork 0
Code
972b1943be
linux/drivers/net
History
Linus Torvalds 06f4e926d2 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1446 commits)
  macvlan: fix panic if lowerdev in a bond
  tg3: Add braces around 5906 workaround.
  tg3: Fix NETIF_F_LOOPBACK error
  macvlan: remove one synchronize_rcu() call
  networking: NET_CLS_ROUTE4 depends on INET
  irda: Fix error propagation in ircomm_lmp_connect_response()
  irda: Kill set but unused variable 'bytes' in irlan_check_command_param()
  irda: Kill set but unused variable 'clen' in ircomm_connect_indication()
  rxrpc: Fix set but unused variable 'usage' in rxrpc_get_transport()
  be2net: Kill set but unused variable 'req' in lancer_fw_download()
  irda: Kill set but unused vars 'saddr' and 'daddr' in irlan_provider_connect_indication()
  atl1c: atl1c_resume() is only used when CONFIG_PM_SLEEP is defined.
  rxrpc: Fix set but unused variable 'usage' in rxrpc_get_peer().
  rxrpc: Kill set but unused variable 'local' in rxrpc_UDP_error_handler()
  rxrpc: Kill set but unused variable 'sp' in rxrpc_process_connection()
  rxrpc: Kill set but unused variable 'sp' in rxrpc_rotate_tx_window()
  pkt_sched: Kill set but unused variable 'protocol' in tc_classify()
  isdn: capi: Use pr_debug() instead of ifdefs.
  tg3: Update version to 3.119
  tg3: Apply rx_discards fix to 5719/5720
  ...

Fix up trivial conflicts in arch/x86/Kconfig and net/mac80211/agg-tx.c
as per Davem.
2011-05-20 13:43:21 -07:00
..
appletalk
arcnet
arm Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 2011-05-20 13:43:21 -07:00
atl1c atl1c: atl1c_resume() is only used when CONFIG_PM_SLEEP is defined. 2011-05-19 18:44:41 -04:00
atl1e ethtool: cosmetic: Use ethtool ethtool_cmd_speed API 2011-04-29 14:03:01 -07:00
atlx ethtool: cosmetic: Use ethtool ethtool_cmd_speed API 2011-04-29 14:03:01 -07:00
benet be2net: Kill set but unused variable 'req' in lancer_fw_download() 2011-05-19 18:49:54 -04:00
bna ethtool: cosmetic: Use ethtool ethtool_cmd_speed API 2011-04-29 14:03:01 -07:00
bnx2x bnx2x: add support for retrieving dcb peer configuration 2011-05-18 17:28:52 -04:00
bonding Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 2011-05-17 17:33:11 -04:00
caif
can drivercore: revert addition of of_match to struct device 2011-05-18 12:32:23 -06:00
chelsio ethtool: cosmetic: Use ethtool ethtool_cmd_speed API 2011-04-29 14:03:01 -07:00
cris
cxgb3 ethtool: cosmetic: Use ethtool ethtool_cmd_speed API 2011-04-29 14:03:01 -07:00
cxgb4 ethtool: cosmetic: Use ethtool ethtool_cmd_speed API 2011-04-29 14:03:01 -07:00
cxgb4vf ethtool: cosmetic: Use ethtool ethtool_cmd_speed API 2011-04-29 14:03:01 -07:00
e1000 e1000: convert to set_phys_id 2011-05-07 03:10:13 -07:00
e1000e e1000e: minor comment cleanups 2011-05-14 17:50:01 -07:00
ehea Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 2011-05-20 13:43:21 -07:00
enic ethtool: cosmetic: Use ethtool ethtool_cmd_speed API 2011-04-29 14:03:01 -07:00
fs_enet Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 2011-05-20 13:43:21 -07:00
hamradio net: call dev_alloc_name from register_netdevice 2011-05-05 10:57:45 -07:00
ibm_newemac
igb igb: convert to ethtool set_phys_id 2011-05-07 03:11:57 -07:00
igbvf igbvf: remove bogus phys_id 2011-05-04 12:12:22 -07:00
irda net: fix section mismatches 2011-04-18 22:59:04 -07:00
ixgb ixgb: convert to set_phys_id 2011-05-04 12:07:41 -07:00
ixgbe Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 2011-05-20 13:43:21 -07:00
ixgbevf ixgbevf: Add macvlan support in the set rx mode op 2011-05-14 17:50:44 -07:00
ixp2000
mlx4 ethtool: cosmetic: Use ethtool ethtool_cmd_speed API 2011-04-29 14:03:01 -07:00
myri10ge ethtool: cosmetic: Use ethtool ethtool_cmd_speed API 2011-04-29 14:03:01 -07:00
netxen ethtool: cosmetic: Use ethtool ethtool_cmd_speed API 2011-04-29 14:03:01 -07:00
octeon
pch_gbe Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-3.6 2011-05-11 14:26:58 -04:00
pcmcia ethtool: cosmetic: Use ethtool ethtool_cmd_speed API 2011-04-29 14:03:01 -07:00
phy ethtool: cosmetic: Use ethtool ethtool_cmd_speed API 2011-04-29 14:03:01 -07:00
qlcnic qlcnic: Bumped up version number to 5.0.18 2011-05-13 14:44:14 -04:00
qlge ethtool: cosmetic: Use ethtool ethtool_cmd_speed API 2011-04-29 14:03:01 -07:00
sfc sfc: Don't use enums as a bitmask. 2011-05-17 17:53:22 -04:00
skfp
stmmac stmmac: fix autoneg in set_pauseparam 2011-05-13 16:12:07 -04:00
tile net:use help function of skb_checksum_start_offset to calculate offset 2011-04-28 13:28:57 -07:00
tokenring olympic: convert to seq_file 2011-05-13 16:50:49 -04:00
tulip tulip: Use pr_<level> where appropriate 2011-05-09 12:51:16 -07:00
usb CDC NCM: Add mising short packet in cdc_ncm driver 2011-05-12 18:30:28 -04:00
vmxnet3 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 2011-05-17 17:33:11 -04:00
vxge ethtool: cosmetic: Use ethtool ethtool_cmd_speed API 2011-04-29 14:03:01 -07:00
wan net: call dev_alloc_name from register_netdevice 2011-05-05 10:57:45 -07:00
wimax
wireless wl12xx: fix compilation error when CONFIG_PM is not set 2011-05-18 16:51:26 -04:00
xen-netback xen: netback: use __CONST_RING_SIZE not __RING_SIZE 2011-05-17 15:27:35 -04:00
3c59x.c net: fix section mismatches 2011-04-18 22:59:04 -07:00
3c501.c
3c501.h
3c503.c
3c503.h
3c505.c
3c505.h
3c507.c
3c509.c ethtool: cosmetic: Use ethtool ethtool_cmd_speed API 2011-04-29 14:03:01 -07:00
3c515.c
3c523.c
3c523.h
3c527.c
3c527.h
7990.c
7990.h
8139cp.c
8139too.c
8390.c
8390.h
8390p.c
82596.c
a2065.c
a2065.h
ac3200.c
acenic.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 2011-05-20 13:43:21 -07:00
acenic.h
amd8111e.c amd8111e: trivial typo spelling: Negotitate -> Negotiate 2011-05-02 14:42:55 -07:00
amd8111e.h
apne.c
ariadne.c
ariadne.h
at1700.c
atarilance.c m68k/atari: Do not use "/" in interrupt names 2011-05-19 18:19:10 +02:00
atp.c
atp.h
au1000_eth.c
au1000_eth.h
ax88796.c
b44.c ethtool: cosmetic: Use ethtool ethtool_cmd_speed API 2011-04-29 14:03:01 -07:00
b44.h
bcm63xx_enet.c ethtool: cosmetic: Use ethtool ethtool_cmd_speed API 2011-04-29 14:03:01 -07:00
bcm63xx_enet.h
bfin_mac.c
bfin_mac.h
bmac.c
bmac.h
bnx2_fw.h
bnx2.c Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 2011-05-05 14:59:02 -07:00
bnx2.h
bsd_comp.c
cassini.c ethtool: cosmetic: Use ethtool ethtool_cmd_speed API 2011-04-29 14:03:01 -07:00
cassini.h
cnic_defs.h
cnic_if.h
cnic.c
cnic.h
cpmac.c
cs89x0.c
cs89x0.h
davinci_cpdma.c
davinci_cpdma.h
davinci_emac.c
davinci_mdio.c
de600.c
de600.h
de620.c
de620.h
declance.c
defxx.c
defxx.h
depca.c net: fix section mismatches 2011-04-18 22:59:04 -07:00
depca.h
dl2k.c ethtool: cosmetic: Use ethtool ethtool_cmd_speed API 2011-04-29 14:03:01 -07:00
dl2k.h
dm9000.c
dm9000.h
dnet.c
dnet.h
dummy.c net: call dev_alloc_name from register_netdevice 2011-05-05 10:57:45 -07:00
e100.c e100: implemenet set_phys_id 2011-05-07 03:08:38 -07:00
e2100.c
eepro.c ethtool: cosmetic: Use ethtool ethtool_cmd_speed API 2011-04-29 14:03:01 -07:00
eexpress.c
eexpress.h
enc28j60_hw.h
enc28j60.c ethtool: cosmetic: Use ethtool ethtool_cmd_speed API 2011-04-29 14:03:01 -07:00
epic100.c
eql.c
es3210.c
eth16i.c
ethoc.c
ewrk3.c ethtool: cosmetic: Use ethtool ethtool_cmd_speed API 2011-04-29 14:03:01 -07:00
ewrk3.h
fealnx.c
fec_mpc52xx_phy.c
fec_mpc52xx.c
fec_mpc52xx.h
fec.c
fec.h
forcedeth.c ethtool: cosmetic: Use ethtool ethtool_cmd_speed API 2011-04-29 14:03:01 -07:00
fsl_pq_mdio.c
fsl_pq_mdio.h
ftmac100.c net: ftmac100: fix scheduling while atomic during PHY link status change 2011-04-29 12:41:59 -07:00
ftmac100.h
gianfar_ethtool.c
gianfar_sysfs.c
gianfar.c
gianfar.h
greth.c
greth.h
hamachi.c hamachi: Put back RX_CHECKSUM 2011-05-07 22:31:35 -07:00
hp100.c net: fix section mismatches 2011-04-18 22:59:04 -07:00
hp100.h
hp-plus.c
hp.c
hplance.c
hplance.h
hydra.c hydra: Fix regression caused during net_device_ops conversion 2011-05-12 16:59:57 -04:00
ibmlana.c net: fix section mismatches 2011-04-18 22:59:04 -07:00
ibmlana.h
ibmveth.c ethtool: cosmetic: Use ethtool ethtool_cmd_speed API 2011-04-29 14:03:01 -07:00
ibmveth.h
ifb.c net: call dev_alloc_name from register_netdevice 2011-05-05 10:57:45 -07:00
ioc3-eth.c
ipg.c
ipg.h
iseries_veth.c
jazzsonic.c
jme.c ethtool: Use full 32 bit speed range in ethtool's set_settings 2011-04-29 14:03:00 -07:00
jme.h
Kconfig MIPS: Lantiq: Add ethernet driver 2011-05-19 09:55:43 +01:00
korina.c
ks8842.c
ks8851_mll.c
ks8851.c
ks8851.h
ksz884x.c ethtool: Use full 32 bit speed range in ethtool's set_settings 2011-04-29 14:03:00 -07:00
lance.c
lantiq_etop.c MIPS: Lantiq: Add ethernet driver 2011-05-19 09:55:43 +01:00
lasi_82596.c
lib8390.c
lib82596.c
LICENSE.SRC
ll_temac_main.c
ll_temac_mdio.c
ll_temac.h
lne390.c
loopback.c net: Allow ethtool to set interface in loopback mode. 2011-05-08 15:59:12 -07:00
lp486e.c
mac89x0.c
mac8390.c
macb.c
macb.h
mace.c
mace.h
macmace.c
macsonic.c
macvlan.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 2011-05-20 13:43:21 -07:00
macvtap.c
Makefile MIPS: Lantiq: Add ethernet driver 2011-05-19 09:55:43 +01:00
mdio.c ethtool: cosmetic: Use ethtool ethtool_cmd_speed API 2011-04-29 14:03:01 -07:00
meth.c
meth.h
mii.c Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 2011-05-05 14:59:02 -07:00
mipsnet.c
mv643xx_eth.c ethtool: cosmetic: Use ethtool ethtool_cmd_speed API 2011-04-29 14:03:01 -07:00
mvme147.c
myri_sbus.c
myri_sbus.h
natsemi.c ethtool: cosmetic: Use ethtool ethtool_cmd_speed API 2011-04-29 14:03:01 -07:00
ne2.c
ne2k-pci.c
ne3210.c net: fix section mismatches 2011-04-18 22:59:04 -07:00
ne-h8300.c ne-h8300: Fix regression caused during net_device_ops conversion 2011-05-12 16:59:57 -04:00
ne.c
netconsole.c net: add mac_pton() for parsing MAC address 2011-05-09 12:10:49 -07:00
netx-eth.c
ni52.c
ni52.h
ni65.c
ni65.h
ni5010.c
ni5010.h
niu.c ethtool: cosmetic: Use ethtool ethtool_cmd_speed API 2011-04-29 14:03:01 -07:00
niu.h
ns83820.c ethtool: cosmetic: Use ethtool ethtool_cmd_speed API 2011-04-29 14:03:01 -07:00
pasemi_mac_ethtool.c
pasemi_mac.c
pasemi_mac.h
pci-skeleton.c
pcnet32.c ethtool: Call ethtool's get/set_settings callbacks with cleaned data 2011-04-29 14:01:30 -07:00
plip.c
ppp_async.c
ppp_deflate.c
ppp_generic.c
ppp_mppe.c
ppp_mppe.h
ppp_synctty.c
pppoe.c
pppox.c
pptp.c pptp: Use flowi4's daddr/saddr in pptp_xmit(). 2011-05-03 20:41:42 -07:00
ps3_gelic_net.c ethtool: cosmetic: Use ethtool ethtool_cmd_speed API 2011-04-29 14:03:01 -07:00
ps3_gelic_net.h
ps3_gelic_wireless.c
ps3_gelic_wireless.h
pxa168_eth.c
qla3xxx.c ethtool: cosmetic: Use ethtool ethtool_cmd_speed API 2011-04-29 14:03:01 -07:00
qla3xxx.h
r6040.c
r8169.c r8169: avoid late chip identifier initialisation. 2011-05-09 21:03:12 +02:00
rionet.c
rrunner.c
rrunner.h
s2io-regs.h
s2io.c ethtool: cosmetic: Use ethtool ethtool_cmd_speed API 2011-04-29 14:03:01 -07:00
s2io.h
s6gmac.c
sb1000.c
sb1250-mac.c
sc92031.c ethtool: cosmetic: Use ethtool ethtool_cmd_speed API 2011-04-29 14:03:01 -07:00
seeq8005.c
seeq8005.h
sgiseeq.c
sgiseeq.h
sh_eth.c
sh_eth.h
sis190.c
sis900.c
sis900.h
skge.c ethtool: cosmetic: Use ethtool ethtool_cmd_speed API 2011-04-29 14:03:01 -07:00
skge.h
sky2.c ethtool: cosmetic: Use ethtool ethtool_cmd_speed API 2011-04-29 14:03:01 -07:00
sky2.h
slhc.c
slip.c NET: slip, fix ldisc->open retval 2011-05-09 11:53:07 -07:00
slip.h
smc91x.c ethtool: cosmetic: Use ethtool ethtool_cmd_speed API 2011-04-29 14:03:01 -07:00
smc91x.h
smc911x.c ethtool: cosmetic: Use ethtool ethtool_cmd_speed API 2011-04-29 14:03:01 -07:00
smc911x.h
smc9194.c
smc9194.h
smc-mca.c net: fix section mismatches 2011-04-18 22:59:04 -07:00
smc-ultra32.c
smc-ultra.c
smsc911x.c
smsc911x.h
smsc9420.c
smsc9420.h
sni_82596.c
sonic.c
sonic.h
Space.c
spider_net_ethtool.c ethtool: cosmetic: Use ethtool ethtool_cmd_speed API 2011-04-29 14:03:01 -07:00
spider_net.c
spider_net.h
starfire.c
stnic.c
sun3_82586.c
sun3_82586.h
sun3lance.c
sunbmac.c
sunbmac.h
sundance.c
sungem_phy.c
sungem_phy.h
sungem.c ethtool: cosmetic: Use ethtool ethtool_cmd_speed API 2011-04-29 14:03:01 -07:00
sungem.h
sunhme.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 2011-05-20 13:43:21 -07:00
sunhme.h
sunlance.c
sunqe.c
sunqe.h
sunvnet.c
sunvnet.h
tc35815.c
tehuti.c ethtool: cosmetic: Use ethtool ethtool_cmd_speed API 2011-04-29 14:03:01 -07:00
tehuti.h
tg3.c tg3: Add braces around 5906 workaround. 2011-05-20 00:33:19 -04:00
tg3.h tg3: Fix stats for 5704 and later devices 2011-05-19 18:00:00 -04:00
tlan.c
tlan.h
tsi108_eth.c
tsi108_eth.h
tun.c net: call dev_alloc_name from register_netdevice 2011-05-05 10:57:45 -07:00
typhoon.c ethtool: cosmetic: Use ethtool ethtool_cmd_speed API 2011-04-29 14:03:01 -07:00
typhoon.h
ucc_geth_ethtool.c
ucc_geth.c
ucc_geth.h
veth.c net: drivers: kill two unused macro definitions 2011-05-15 18:01:15 -04:00
via-rhine.c
via-velocity.c ethtool: cosmetic: Use ethtool ethtool_cmd_speed API 2011-04-29 14:03:01 -07:00
via-velocity.h
virtio_net.c
wd.c
xen-netfront.c
xilinx_emaclite.c
xtsonic.c
yellowfin.c
znet.c
zorro8390.c zorro8390: Fix regression caused during net_device_ops conversion 2011-05-12 16:59:57 -04:00