dect
/
linux-2.6
Archived
13
0
Fork 0
This repository has been archived on 2022-02-17. You can view files and clone it, but cannot push or open issues or pull requests.
linux-2.6/drivers/net/ethernet
Linus Torvalds 7fd83b47ce Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Pull networking fixes from David Miller:

1) GRE tunnel drivers don't set the transport header properly, they also
   blindly deref the inner protocol ipv4 and needs some checks.  Fixes
   from Isaku Yamahata.

2) Fix sleeps while atomic in netdevice rename code, from Eric Dumazet.

3) Fix double-spinlock in solos-pci driver, from Dan Carpenter.

4) More ARP bug fixes.  Fix lockdep splat in arp_solicit() and then the
   bug accidentally added by that fix.  From Eric Dumazet and Cong Wang.

5) Remove some __dev* annotations that slipped back in, as well as all
   HOTPLUG references.  From Greg KH

6) RDS protocol uses wrong interfaces to access scatter-gather elements,
   causing a regression.  From Mike Marciniszyn.

7) Fix build error in cpts driver, from Richard Cochran.

8) Fix arithmetic in packet scheduler, from Stefan Hasko.

9) Similarly, fix association during calculation of random backoff in
   batman-adv.  From Akinobu Mita.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (21 commits)
  ipv6/ip6_gre: set transport header correctly
  ipv4/ip_gre: set transport header correctly to gre header
  IB/rds: suppress incompatible protocol when version is known
  IB/rds: Correct ib_api use with gs_dma_address/sg_dma_len
  net/vxlan: Use the underlying device index when joining/leaving multicast groups
  tcp: should drop incoming frames without ACK flag set
  netprio_cgroup: define sk_cgrp_prioidx only if NETPRIO_CGROUP is enabled
  cpts: fix a run time warn_on.
  cpts: fix build error by removing useless code.
  batman-adv: fix random jitter calculation
  arp: fix a regression in arp_solicit()
  net: sched: integer overflow fix
  CONFIG_HOTPLUG removal from networking core
  Drivers: network: more __dev* removal
  bridge: call br_netpoll_disable in br_add_if
  ipv4: arp: fix a lockdep splat in arp_solicit()
  tuntap: dont use a private kmem_cache
  net: devnet_rename_seq should be a seqcount
  ip_gre: fix possible use after free
  ip_gre: make ipgre_tunnel_xmit() not parse network header as IP unconditionally
  ...
2012-12-27 10:40:30 -08:00
..
3com drivers/net: fix up function prototypes after __dev* removals 2012-12-07 14:22:22 -05:00
8390 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2012-12-13 12:00:02 -08:00
adaptec drivers/net: fix up function prototypes after __dev* removals 2012-12-07 14:22:22 -05:00
adi bfin_mac: remove __dev* attributes 2012-12-03 11:16:41 -08:00
aeroflex aeroflex: remove __dev* attributes 2012-12-03 11:16:41 -08:00
alteon drivers/net: fix up function prototypes after __dev* removals 2012-12-07 14:22:22 -05:00
amd drivers/net: fix up function prototypes after __dev* removals 2012-12-07 14:22:22 -05:00
apple net/apple: remove __dev* attributes 2012-12-03 11:16:54 -08:00
atheros drivers/net: fix up function prototypes after __dev* removals 2012-12-07 14:22:22 -05:00
broadcom bnx2x: use prandom_bytes() 2012-12-17 17:15:26 -08:00
brocade bna: Driver Version Updated to 3.1.2.1 2012-12-11 18:25:53 -05:00
cadence net/cadence: remove __dev* attributes 2012-12-03 11:16:54 -08:00
calxeda net: calxedaxgmac: ip align receive buffers 2012-11-07 03:51:14 -05:00
chelsio RDMA/cxgb4: Fix bug for active and passive LE hash collision path 2012-12-19 23:03:12 -08:00
cirrus cs89x0 : packet reception not working 2012-08-31 15:48:56 -04:00
cisco drivers/net: fix up function prototypes after __dev* removals 2012-12-07 14:22:22 -05:00
davicom net: dm9000: use io{read,write}*_rep accessors 2012-12-10 15:46:27 -05:00
dec drivers/net: fix up function prototypes after __dev* removals 2012-12-07 14:22:22 -05:00
dlink Networking: Remove __dev* markings from the networking drivers 2012-12-03 15:35:28 -05:00
emulex be2net: fix wrong frag_idx reported by RX CQ 2012-12-18 16:18:39 -08:00
faraday
freescale net: fec: forbid FEC_PTP on SoCs that do not support 2012-12-18 16:26:18 -08:00
fujitsu
hp drivers/net: fix up function prototypes after __dev* removals 2012-12-07 14:22:22 -05:00
i825xx i825xx: remove __dev* attributes 2012-12-03 11:16:12 -08:00
ibm Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc 2012-12-18 09:58:09 -08:00
icplus drivers/net: fix up function prototypes after __dev* removals 2012-12-07 14:22:22 -05:00
intel Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2012-12-13 12:00:02 -08:00
marvell Drivers: network: more __dev* removal 2012-12-22 00:03:00 -08:00
mellanox mlx4_core: Allow choosing flow steering mode 2012-12-19 11:47:22 -08:00
micrel ksz884x: fix receive polling race condition 2012-12-19 12:44:45 -08:00
microchip enc28j60: remove __dev* attributes 2012-12-03 11:16:44 -08:00
myricom Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2012-12-13 12:00:02 -08:00
natsemi drivers/net: fix up function prototypes after __dev* removals 2012-12-07 14:22:22 -05:00
neterion drivers/net: fix up function prototypes after __dev* removals 2012-12-07 14:22:22 -05:00
nuvoton nuvoton: remove __dev* attributes 2012-12-03 11:16:44 -08:00
nvidia forcedeth: remove __dev* attributes 2012-12-03 11:16:44 -08:00
nxp lpc_eth: remove __dev* attributes 2012-12-03 11:16:44 -08:00
octeon net/octeon_mgmt: remove __dev* attributes 2012-12-03 11:16:45 -08:00
oki-semi pch_gbe, ptp_pch: Fix the dependency direction between these drivers 2012-11-17 22:11:45 -05:00
packetengines drivers/net: fix up function prototypes after __dev* removals 2012-12-07 14:22:22 -05:00
pasemi net/pasemi: remove __dev* attributes 2012-12-03 11:16:55 -08:00
qlogic qlcnic: update driver version 2012-12-19 12:42:48 -08:00
racal
rdc drivers/net: fix up function prototypes after __dev* removals 2012-12-07 14:22:22 -05:00
realtek 8139cp: Prevent dev_close/cp_interrupt race on MTU change 2012-12-19 14:30:59 -08:00
renesas net: sh_eth: Fix a typo - replace regist with register. 2012-11-03 15:37:35 -04:00
seeq seeq: remove __dev* attributes 2012-12-03 11:16:46 -08:00
sfc drivers/net: fix up function prototypes after __dev* removals 2012-12-07 14:22:22 -05:00
sgi drivers/net: fix up function prototypes after __dev* removals 2012-12-07 14:22:22 -05:00
silan drivers/net: fix up function prototypes after __dev* removals 2012-12-07 14:22:22 -05:00
sis drivers/net: fix up function prototypes after __dev* removals 2012-12-07 14:22:22 -05:00
smsc drivers/net: Use of_match_ptr() macro in smsc911x.c 2012-12-19 12:50:07 -08:00
stmicro stmmac: fix platform driver unregistering 2012-12-14 13:14:07 -05:00
sun drivers/net: fix up function prototypes after __dev* removals 2012-12-07 14:22:22 -05:00
tehuti tehuti: remove __dev* attributes 2012-12-03 11:16:53 -08:00
ti cpts: fix a run time warn_on. 2012-12-26 14:15:09 -08:00
tile tilegx: request_irq with a non-null device name 2012-11-16 01:40:41 -05:00
toshiba drivers/net: fix up function prototypes after __dev* removals 2012-12-07 14:22:22 -05:00
tundra drivers/net/ethernet/tundra/tsi108_eth.c: delete double assignment 2012-08-30 13:08:37 -04:00
via drivers/net: fix up function prototypes after __dev* removals 2012-12-07 14:22:22 -05:00
wiznet net/wiznet: remove __dev* attributes 2012-12-03 11:16:56 -08:00
xilinx net/xilinx: remove __dev* attributes 2012-12-03 11:16:56 -08:00
xircom
xscale ixp4xx_eth: remove __dev* attributes 2012-12-03 11:16:53 -08:00
Kconfig net: mipsnet: Remove the MIPSsim Ethernet driver. 2012-09-24 16:47:23 -04:00
Makefile net: mipsnet: Remove the MIPSsim Ethernet driver. 2012-09-24 16:47:23 -04:00
dnet.c net/ethernet: remove __dev* attributes 2012-12-03 11:16:56 -08:00
dnet.h
ethoc.c net/ethernet: remove __dev* attributes 2012-12-03 11:16:56 -08:00
fealnx.c drivers/net: fix up function prototypes after __dev* removals 2012-12-07 14:22:22 -05:00
jme.c jme: remove __dev* attributes 2012-12-03 11:16:54 -08:00
jme.h
korina.c
lantiq_etop.c net/ethernet: remove __dev* attributes 2012-12-03 11:16:56 -08:00
netx-eth.c ARM: netx: move platform_data definitions 2012-09-14 11:17:36 +02:00
s6gmac.c net/ethernet: remove __dev* attributes 2012-12-03 11:16:56 -08:00