Lubancat2/kernel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
23bb57633df97ede067ea26f3cdc8a7ba2cd8109
kernel/drivers/net
History
John W. Linville 09f921f83f Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 
Conflicts:
	drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
2010-12-02 15:46:37 -05:00
..
appletalk
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2010-10-24 13:41:39 -07:00
arcnet
…
arm
…
atl1c
atl1c: make functions static
2010-10-24 14:55:49 -07:00
atl1e
vlan: Don't check for vlan group before vlan_tx_tag_present.
2010-10-21 01:26:52 -07:00
atlx
atlx: make local functions/data static
2010-10-24 14:55:49 -07:00
benet
be2net: Schedule/Destroy worker thread in probe()/remove() rather than open()/close()
2010-10-27 11:37:30 -07:00
bna
vlan: Don't check for vlan group before vlan_tx_tag_present.
2010-10-21 01:26:52 -07:00
bnx2x
bnx2x: make local function static and remove dead code
2010-10-24 15:07:13 -07:00
bonding
bonding: Fix lockdep warning after bond_vlan_rx_register()
2010-10-27 14:24:07 -07:00
caif
caif-u5500: Build config for CAIF shared mem driver
2010-10-27 12:29:53 -07:00
can
netdev: can: Change mail address of Hans J. Koch
2010-10-30 16:49:38 -07:00
chelsio
vlan: Don't check for vlan group before vlan_tx_tag_present.
2010-10-21 01:26:52 -07:00
cris
…
cxgb3
cxgb3: Fix panic in free_tx_desc()
2010-10-28 10:27:02 -07:00
cxgb4
cxgb4: update to utilize the newer VLAN infrastructure
2010-10-24 15:52:31 -07:00
cxgb4vf
…
e1000
e1000: make e1000_reinit_safe local
2010-10-24 15:07:14 -07:00
e1000e
e1000e: Add check for reset flags before displaying reset message
2010-10-28 10:18:59 -07:00
ehea
ehea: Fixing statistics
2010-10-27 14:24:13 -07:00
enic
vlan: Don't check for vlan group before vlan_tx_tag_present.
2010-10-21 01:26:52 -07:00
fs_enet
…
hamradio
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2010-10-24 13:41:39 -07:00
ibm_newemac
…
igb
igb: Fix unused variable warning.
2010-10-27 19:43:55 -07:00
igbvf
igbvf: fix panic on load
2010-10-28 10:19:01 -07:00
irda
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2010-10-24 13:41:39 -07:00
ixgb
ixgb: call pci_disable_device in ixgb_remove
2010-10-28 10:19:00 -07:00
ixgbe
ixgbe: DCB, fix TX hang occurring in stress condition with PFC
2010-10-28 10:19:00 -07:00
ixgbevf
vlan: Don't check for vlan group before vlan_tx_tag_present.
2010-10-21 01:26:52 -07:00
ixp2000
…
mlx4
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
2010-10-27 18:28:00 -07:00
myri10ge
…
netxen
netxen_nic: Fix the tx queue manipulation bug in netxen_nic_probe
2010-10-30 16:24:25 -07:00
octeon
…
pch_gbe
pch_gbe: make local functions static
2010-10-21 03:09:44 -07:00
pcmcia
pcnet_cs: add new_id
2010-10-30 16:49:37 -07:00
phy
phy/marvell: rename 88ec048 to 88e1318s and fix mscr1 addr
2010-10-29 13:50:25 -07:00
qlcnic
qlcnic: define valid vlan id range
2010-10-27 12:21:54 -07:00
qlge
qlge: bugfix: Restoring the vlan setting.
2010-10-27 11:37:30 -07:00
sfc
sfc: make functions static
2010-10-21 03:09:43 -07:00
skfp
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2010-10-24 13:41:39 -07:00
stmmac
stmmac: enable/disable rx/tx in the core with a single write.
2010-10-28 11:47:54 -07:00
tokenring
tms380tr: Use mdelay() in tms380tr_wait().
2010-10-25 13:04:48 -07:00
tulip
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2010-10-24 13:41:39 -07:00
usb
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2010-10-24 13:41:39 -07:00
vmxnet3
vmxnet: trivial annotation of protocol constant
2010-10-30 16:19:45 -07:00
vxge
vxge: make functions local and remove dead code
2010-10-24 15:07:12 -07:00
wan
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2010-10-24 13:41:39 -07:00
wimax
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6
2010-10-23 11:47:02 -07:00
wireless
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
2010-12-02 15:46:37 -05:00
3c59x.c
…
3c501.c
…
3c501.h
…
3c503.c
…
3c503.h
…
3c505.c
…
3c505.h
…
3c507.c
…
3c509.c
…
3c515.c
…
3c523.c
3c52x: remove IRQF_SAMPLE_RANDOM from legacy MCA drivers.
2010-10-19 02:32:09 -07:00
3c523.h
…
3c527.c
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6
2010-10-23 11:47:02 -07:00
3c527.h
…
7990.c
…
7990.h
…
8139cp.c
vlan: Don't check for vlan group before vlan_tx_tag_present.
2010-10-21 01:26:52 -07:00
8139too.c
…
8390.c
…
8390.h
…
8390p.c
…
82596.c
…
a2065.c
…
a2065.h
…
ac3200.c
…
acenic.c
…
acenic.h
…
amd8111e.c
vlan: Don't check for vlan group before vlan_tx_tag_present.
2010-10-21 01:26:52 -07:00
amd8111e.h
…
apne.c
…
ariadne.c
…
ariadne.h
…
at1700.c
…
atarilance.c
net: atarilance - flags should be unsigned long
2010-10-28 11:47:53 -07:00
atp.c
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2010-10-24 13:41:39 -07:00
atp.h
…
au1000_eth.c
…
au1000_eth.h
…
ax88796.c
drivers/net/ax88796.c: Return error code in failure
2010-10-21 04:25:50 -07:00
b44.c
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
2010-10-21 08:43:05 -07:00
b44.h
…
bcm63xx_enet.c
…
bcm63xx_enet.h
…
bfin_mac.c
netdev: bfin_mac: push settings to platform resources
2010-10-25 04:54:25 -04:00
bfin_mac.h
netdev: bfin_mac: push settings to platform resources
2010-10-25 04:54:25 -04:00
bmac.c
…
bmac.h
…
bnx2_fw.h
…
bnx2.c
bnx2/bnx2x: Unsupported Ethtool operations should return -EINVAL.
2010-10-21 19:59:32 -07:00
bnx2.h
bnx2: Increase max rx ring size from 1K to 2K
2010-10-21 03:09:47 -07:00
bsd_comp.c
…
cassini.c
…
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
…
depca.h
…
dl2k.c
…
dl2k.h
…
dm9000.c
…
dm9000.h
…
dnet.c
…
dnet.h
…
dummy.c
…
e100.c
…
e2100.c
…
eepro.c
…
eexpress.c
…
eexpress.h
…
enc28j60_hw.h
…
enc28j60.c
…
epic100.c
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2010-10-24 13:41:39 -07:00
eql.c
…
es3210.c
…
eth16i.c
…
ethoc.c
…
ewrk3.c
…
ewrk3.h
…
fealnx.c
…
fec_mpc52xx_phy.c
…
fec_mpc52xx.c
…
fec_mpc52xx.h
…
fec.c
…
fec.h
…
forcedeth.c
vlan: Don't check for vlan group before vlan_tx_tag_present.
2010-10-21 01:26:52 -07:00
fsl_pq_mdio.c
…
fsl_pq_mdio.h
…
gianfar_ethtool.c
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
2010-10-21 08:43:05 -07:00
gianfar_sysfs.c
…
gianfar.c
gianfar: Fix crashes on RX path (Was Re: [Bugme-new] [Bug 19692] New: linux-2.6.36-rc5 crash with gianfar ethernet at full line rate traffic)
2010-10-27 11:37:28 -07:00
gianfar.h
…
greth.c
…
greth.h
…
hamachi.c
…
hp100.c
…
hp100.h
…
hp-plus.c
…
hp.c
…
hplance.c
…
hplance.h
…
hydra.c
…
ibmlana.c
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2010-10-24 13:41:39 -07:00
ibmlana.h
…
ibmveth.c
ibmveth: Free irq on error path
2010-10-21 01:26:46 -07:00
ibmveth.h
…
ifb.c
…
ioc3-eth.c
…
ipg.c
…
ipg.h
…
iseries_veth.c
…
jazzsonic.c
…
jme.c
jme: Support WoL after shutdown
2010-10-24 16:18:25 -07:00
jme.h
jme: Advance version number
2010-10-21 03:52:11 -07:00
Kconfig
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
2010-10-29 14:17:12 -07:00
korina.c
…
ks8842.c
…
ks8851_mll.c
…
ks8851.c
…
ks8851.h
…
ksz884x.c
…
lance.c
…
lasi_82596.c
…
lib8390.c
8390: Don't oops on starting dev queue
2010-10-28 10:27:01 -07:00
lib82596.c
…
LICENSE.SRC
…
ll_temac_main.c
…
ll_temac_mdio.c
…
ll_temac.h
…
lne390.c
…
loopback.c
…
lp486e.c
…
mac89x0.c
…
mac8390.c
…
macb.c
macb: Don't re-enable interrupts while in polling mode
2010-10-25 12:14:11 -07:00
macb.h
…
mace.c
…
mace.h
…
macmace.c
…
macsonic.c
…
macvlan.c
…
macvtap.c
…
Makefile
Merge branch 'davinci-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci
2010-10-25 10:59:31 -07:00
mdio.c
…
meth.c
…
meth.h
…
mii.c
…
mipsnet.c
…
mv643xx_eth.c
…
mvme147.c
…
myri_sbus.c
…
myri_sbus.h
…
natsemi.c
…
ne2.c
…
ne2k-pci.c
…
ne3210.c
…
ne-h8300.c
…
ne.c
…
netconsole.c
…
netx-eth.c
…
ni52.c
…
ni52.h
…
ni65.c
…
ni65.h
…
ni5010.c
…
ni5010.h
…
niu.c
…
niu.h
…
ns83820.c
…
pasemi_mac_ethtool.c
…
pasemi_mac.c
…
pasemi_mac.h
…
pci-skeleton.c
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2010-10-24 13:41:39 -07:00
pcnet32.c
…
plip.c
…
ppp_async.c
…
ppp_deflate.c
…
ppp_generic.c
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6
2010-10-23 11:47:02 -07:00
ppp_mppe.c
…
ppp_mppe.h
…
ppp_synctty.c
…
pppoe.c
…
pppox.c
…
pptp.c
…
ps3_gelic_net.c
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2010-10-24 13:41:39 -07:00
ps3_gelic_net.h
…
ps3_gelic_wireless.c
…
ps3_gelic_wireless.h
…
pxa168_eth.c
…
qla3xxx.c
…
qla3xxx.h
…
r6040.c
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
2010-10-21 08:43:05 -07:00
r8169.c
r8169: print errors when dma mapping fail
2010-10-21 01:32:48 -07:00
rionet.c
…
rrunner.c
…
rrunner.h
…
s2io-regs.h
…
s2io.c
vlan: Don't check for vlan group before vlan_tx_tag_present.
2010-10-21 01:26:52 -07:00
s2io.h
…
s6gmac.c
…
sb1000.c
drivers/net/sb1000.c: delete double assignment
2010-10-27 12:23:20 -07:00
sb1250-mac.c
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2010-10-24 13:41:39 -07:00
sc92031.c
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2010-10-24 13:41:39 -07:00
seeq8005.c
…
seeq8005.h
…
sgiseeq.c
drivers/net: sgiseeq: fix return on error
2010-10-26 10:02:13 -07:00
sgiseeq.h
…
sh_eth.c
…
sh_eth.h
…
sis190.c
…
sis900.c
…
sis900.h
…
skge.c
…
skge.h
…
sky2.c
vlan: Don't check for vlan group before vlan_tx_tag_present.
2010-10-21 01:26:52 -07:00
sky2.h
…
slhc.c
slhc: Don't export symbols twice
2010-10-24 16:25:39 -07:00
slip.c
…
slip.h
…
smc91x.c
…
smc91x.h
…
smc911x.c
…
smc911x.h
…
smc9194.c
…
smc9194.h
…
smc-mca.c
…
smc-ultra32.c
…
smc-ultra.c
…
smsc911x.c
MN10300: ASB2364: Add support for SMSC911X and SMC911X
2010-10-27 17:28:58 +01:00
smsc911x.h
MN10300: ASB2364: Add support for SMSC911X and SMC911X
2010-10-27 17:28:58 +01:00
smsc9420.c
…
smsc9420.h
…
sni_82596.c
…
sonic.c
…
sonic.h
…
Space.c
…
spider_net_ethtool.c
…
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
…
sungem.h
…
sunhme.c
…
sunhme.h
…
sunlance.c
…
sunqe.c
…
sunqe.h
…
sunvnet.c
…
sunvnet.h
…
tc35815.c
…
tehuti.c
…
tehuti.h
…
tg3.c
tg3: Do not call device_set_wakeup_enable() under spin_lock_bh
2010-10-26 11:34:09 -07:00
tg3.h
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
2010-10-21 08:43:05 -07:00
tlan.c
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2010-10-24 13:41:39 -07:00
tlan.h
…
tsi108_eth.c
…
tsi108_eth.h
…
tun.c
…
typhoon.c
drivers/net/typhoon.c: delete double assignment
2010-10-27 12:23:20 -07:00
typhoon.h
…
ucc_geth_ethtool.c
…
ucc_geth.c
…
ucc_geth.h
…
veth.c
…
via-rhine.c
…
via-velocity.c
vlan: Don't check for vlan group before vlan_tx_tag_present.
2010-10-21 01:26:52 -07:00
via-velocity.h
…
virtio_net.c
…
wd.c
…
xen-netfront.c
Merge branch 'stable/xen-pcifront-0.8.2' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen
2010-10-28 17:11:17 -07:00
xilinx_emaclite.c
Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze
2010-10-25 16:53:11 -07:00
xtsonic.c
…
yellowfin.c
…
znet.c
…
zorro8390.c
…