1
0
Fork 0
alistair23-linux/drivers/atm
Linus Torvalds f0094b28f3 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Pull networking fixes from David Miller:
 "Several networking final fixes and tidies for the merge window:

   1) Changes during the merge window unintentionally took away the
      ability to build bluetooth modular, fix from Geert Uytterhoeven.

   2) Several phy_node reference count bug fixes from Uwe Kleine-König.

   3) Fix ucc_geth build failures, also from Uwe Kleine-König.

   4) Fix klog false positivies when netlink messages go to network
      taps, by properly resetting the network header.  Fix from Daniel
      Borkmann.

   5) Sizing estimate of VF netlink messages is too small, from Jiri
      Benc.

   6) New APM X-Gene SoC ethernet driver, from Iyappan Subramanian.

   7) VLAN untagging is erroneously dependent upon whether the VLAN
      module is loaded or not, but there are generic dependencies that
      matter wrt what can be expected as the SKB enters the stack.
      Make the basic untagging generic code, and do it unconditionally.
      From Vlad Yasevich.

   8) xen-netfront only has so many slots in it's transmit queue so
      linearize packets that have too many frags.  From Zoltan Kiss.

   9) Fix suspend/resume PHY handling in bcmgenet driver, from Florian
      Fainelli"

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (55 commits)
  net: bcmgenet: correctly resume adapter from Wake-on-LAN
  net: bcmgenet: update UMAC_CMD only when link is detected
  net: bcmgenet: correctly suspend and resume PHY device
  net: bcmgenet: request and enable main clock earlier
  net: ethernet: myricom: myri10ge: myri10ge.c: Cleaning up missing null-terminate after strncpy call
  xen-netfront: Fix handling packets on compound pages with skb_linearize
  net: fec: Support phys probed from devicetree and fixed-link
  smsc: replace WARN_ON() with WARN_ON_SMP()
  xen-netback: Don't deschedule NAPI when carrier off
  net: ethernet: qlogic: qlcnic: Remove duplicate object file from Makefile
  wan: wanxl: Remove typedefs from struct names
  m68k/atari: EtherNEC - ethernet support (ne)
  net: ethernet: ti: cpmac.c: Cleaning up missing null-terminate after strncpy call
  hdlc: Remove typedefs from struct names
  airo_cs: Remove typedef local_info_t
  atmel: Remove typedef atmel_priv_ioctl
  com20020_cs: Remove typedef com20020_dev_t
  ethernet: amd: Remove typedef local_info_t
  net: Always untag vlan-tagged traffic on input.
  drivers: net: Add APM X-Gene SoC ethernet driver support.
  ...
2014-08-13 18:27:40 -06:00
..
.gitignore [ATM]: Ignore generated file pca200e_ecd.bin2 2006-12-11 14:34:35 -08:00
Kconfig Update broken web addresses in the kernel. 2010-10-18 11:03:14 +02:00
Makefile Drivers: atm: Makefile: replace the use of <module>-objs with <module>-y 2010-10-21 03:09:48 -07:00
adummy.c atm: correct sysfs 'device' link creation and parent relationships 2010-12-10 15:45:05 -08:00
ambassador.c atm: ambassador: use NULL instead of 0 for pointer 2014-02-19 16:39:10 -05:00
ambassador.h ATM: Delete no use FILL_RX_POOLS_IN_BH marco 2011-07-08 09:06:31 -07:00
atmtcp.c drivers/atm/atmtcp.c: fix error return code 2014-08-07 16:02:57 -07:00
eni.c drivers: atm: fix %d confusingly prefixed with 0x in format strings 2014-08-05 13:04:32 -07:00
eni.h eni: fix driver remove function and driver probe error path. 2012-03-16 23:13:20 -07:00
firestream.c atm: firestream: Use del_timer_sync() in teardown path 2014-03-25 21:06:02 -04:00
firestream.h atm: firestream: remove duplicate define 2013-10-21 18:46:46 -04:00
fore200e.c atm: fore200e.c: Cleaning up uninitialized variables 2014-06-02 17:11:03 -07:00
fore200e.h Fix common misspellings 2011-03-31 11:26:23 -03:00
he.c atm: use pci_zalloc_consistent 2014-08-08 15:57:28 -07:00
he.h atm: [he] rewrite buffer handling in receive path 2010-05-31 00:27:47 -07:00
horizon.c Drivers: atm: remove __dev* attributes. 2013-01-03 15:57:04 -08:00
horizon.h long vs. unsigned long - low-hanging fruits in drivers 2007-10-14 12:41:51 -07:00
idt77105.c atm: idt77105: Use del_timer_sync() in exit path 2014-03-25 21:06:02 -04:00
idt77105.h [ATM]: [idt77105] should be __devinit not __init 2006-06-29 16:58:12 -07:00
idt77252.c atm: use pci_zalloc_consistent 2014-08-08 15:57:28 -07:00
idt77252.h Fix common misspellings 2011-03-31 11:26:23 -03:00
idt77252_tables.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
iphase.c Drivers: atm: remove __dev* attributes. 2013-01-03 15:57:04 -08:00
iphase.h atm/iphase: rename fregt_t -> ffreg_t 2013-02-08 14:22:05 -05:00
lanai.c Drivers: atm: remove __dev* attributes. 2013-01-03 15:57:04 -08:00
midway.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
nicstar.c atm: nicstar: remove interruptible_sleep_on_timeout 2014-02-27 15:22:46 -05:00
nicstar.h atm: [nicstar] remove virt_to_bus() and support 64-bit platforms 2010-05-31 00:27:46 -07:00
nicstarmac.c atm: [nicstar] reformatted with Lindent 2010-05-31 00:27:46 -07:00
nicstarmac.copyright drivers/atm/: remove CVS keywords 2008-05-20 14:52:25 -07:00
solos-attrlist.c solos: Add 'Firmware' attribute for Traverse overall firmware version 2010-11-08 12:17:04 -08:00
solos-pci.c solos-pci: fix error return code 2014-08-07 16:02:57 -07:00
suni.c Remove all #inclusions of asm/system.h 2012-03-28 18:30:03 +01:00
suni.h atm: [suni] add support for setting loopback and framing modes 2008-06-17 16:19:24 -07:00
tonga.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
uPD98401.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
uPD98402.c atomic: use <linux/atomic.h> 2011-07-26 16:49:47 -07:00
uPD98402.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
zatm.c Drivers: atm: remove __dev* attributes. 2013-01-03 15:57:04 -08:00
zatm.h Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
zeprom.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00