kernel-fxtec-pro1x/drivers/net/cxgb4
Linus Torvalds 5f05647dd8 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: (1699 commits)
  bnx2/bnx2x: Unsupported Ethtool operations should return -EINVAL.
  vlan: Calling vlan_hwaccel_do_receive() is always valid.
  tproxy: use the interface primary IP address as a default value for --on-ip
  tproxy: added IPv6 support to the socket match
  cxgb3: function namespace cleanup
  tproxy: added IPv6 support to the TPROXY target
  tproxy: added IPv6 socket lookup function to nf_tproxy_core
  be2net: Changes to use only priority codes allowed by f/w
  tproxy: allow non-local binds of IPv6 sockets if IP_TRANSPARENT is enabled
  tproxy: added tproxy sockopt interface in the IPV6 layer
  tproxy: added udp6_lib_lookup function
  tproxy: added const specifiers to udp lookup functions
  tproxy: split off ipv6 defragmentation to a separate module
  l2tp: small cleanup
  nf_nat: restrict ICMP translation for embedded header
  can: mcp251x: fix generation of error frames
  can: mcp251x: fix endless loop in interrupt handler if CANINTF_MERRF is set
  can-raw: add msg_flags to distinguish local traffic
  9p: client code cleanup
  rds: make local functions/variables static
  ...

Fix up conflicts in net/core/dev.c, drivers/net/pcmcia/smc91c92_cs.c and
drivers/net/wireless/ath/ath9k/debug.c as per David
2010-10-23 11:47:02 -07:00
..
cxgb4.h cxgb4: function namespace cleanup (v3) 2010-10-21 04:25:49 -07:00
cxgb4_main.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 2010-10-23 11:47:02 -07:00
cxgb4_uld.h cxgb4: function namespace cleanup (v3) 2010-10-21 04:25:49 -07: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
sge.c drivers/net: avoid some skb->ip_summed initializations 2010-09-02 19:06:22 -07:00
t4_hw.c cxgb4: function namespace cleanup (v3) 2010-10-21 04:25:49 -07: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 cxgb4: don't offload Rx checksums for IPv6 fragments 2010-08-02 16:26:41 -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: handle Rx/Tx queue ranges not starting at 0 2010-08-23 20:38:13 -07:00