2
0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-24 21:24:00 +08:00
linux-next/drivers/net/cxgb4
Linus Torvalds 7a6362800c 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: (1480 commits)
  bonding: enable netpoll without checking link status
  xfrm: Refcount destination entry on xfrm_lookup
  net: introduce rx_handler results and logic around that
  bonding: get rid of IFF_SLAVE_INACTIVE netdev->priv_flag
  bonding: wrap slave state work
  net: get rid of multiple bond-related netdevice->priv_flags
  bonding: register slave pointer for rx_handler
  be2net: Bump up the version number
  be2net: Copyright notice change. Update to Emulex instead of ServerEngines
  e1000e: fix kconfig for crc32 dependency
  netfilter ebtables: fix xt_AUDIT to work with ebtables
  xen network backend driver
  bonding: Improve syslog message at device creation time
  bonding: Call netif_carrier_off after register_netdevice
  bonding: Incorrect TX queue offset
  net_sched: fix ip_tos2prio
  xfrm: fix __xfrm_route_forward()
  be2net: Fix UDP packet detected status in RX compl
  Phonet: fix aligned-mode pipe socket buffer header reserve
  netxen: support for GbE port settings
  ...

Fix up conflicts in drivers/staging/brcm80211/brcmsmac/wl_mac80211.c
with the staging updates.
2011-03-16 16:29:25 -07:00
..
cxgb4_main.c net: Kill NETEVENT_PMTU_UPDATE. 2011-02-08 16:17:55 -08:00
cxgb4_uld.h cxgb4: function namespace cleanup (v3) 2010-10-21 04:25:49 -07:00
cxgb4.h cxgb4: remove a bitmap 2010-12-16 13:16:03 -08:00
l2t.c cxgb4: function namespace cleanup (v3) 2010-10-21 04:25:49 -07:00
l2t.h cxgb4: function namespace cleanup (v3) 2010-10-21 04:25:49 -07:00
Makefile cxgb4: Add main driver file and driver Makefile 2010-04-01 19:29:16 -07:00
sge.c cxgb4: NUMA-aware Tx queue allocations 2010-12-16 13:16:04 -08:00
t4_hw.c cxgb4: extend VPD parsing 2010-12-16 13:16:04 -08:00
t4_hw.h cxgb4: support eeprom read/write on functions other than 0 2010-08-23 20:38:14 -07:00
t4_msg.h RDMA/cxgb4: Use ULP_MODE_TCPDDP 2011-03-14 12:09:12 -07:00
t4_regs.h cxgb4: get on-chip queue info from FW and create a memory window for them 2010-08-02 16:26:42 -07:00
t4fw_api.h cxgb4: distinguish between 1-lane KR/KX and 4-lane KR/KX/KX4 ports 2010-12-16 13:16:00 -08:00