• Linus Torvalds's avatar
    Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 · 4fa4d23f
    Linus Torvalds authored
    * 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6:
      pcnet32: remove private net_device_stats structure
      vortex_up should initialize "err"
      pcnet32: remove compile warnings in non-napi mode
      pcnet32: fix non-napi packet reception
      fix EMAC driver for proper napi_synchronize API
      sky2: shutdown cleanup
      napi_synchronize: waiting for NAPI
      forcedeth msi bugfix
      gianfar: fix obviously wrong #ifdef CONFIG_GFAR_NAPI placement
      fs_enet: Update for API changes
      gianfar: remove orphan struct.
      forcedeth: fix rx-work condition in nv_rx_process_optimized() too
    4fa4d23f
sky2.c 115 KB