summaryrefslogtreecommitdiffstats
path: root/drivers/net/bonding
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2014-07-18 01:06:09 +0200
committerDavid S. Miller <davem@davemloft.net>2014-07-18 01:06:09 +0200
commitc104178dda67c9d8de763e0baa60a00d10d9a839 (patch)
treed5f1540e22aea963868cb4c1371f2c734b934c7d /drivers/net/bonding
parentbonding: update bonding.txt for Layer2 hash factors (diff)
parentcxgb4i: Add ipv6 code to driver, call into libcxgbi ipv6 api (diff)
downloadlinux-c104178dda67c9d8de763e0baa60a00d10d9a839.tar.xz
linux-c104178dda67c9d8de763e0baa60a00d10d9a839.zip
Merge branch 'cxgb4-next'
Anish Bhatt says: ==================== cxgb4i: Add ipv6 support The following patchset add ipv6 support for the cxgb4i(iscsi) driver. Patch 1 moves a define from the iw_cxgb4 to cxgb4 to prevent code duplication, as it is used by cxgb4i and iw_cxgb4 both. Patch 2 exports symbols needed by cxgb4i for ipv6 support from cxgb4. Patch 3 & 4 deal with actual ipv6 code in libcxgbi/cxgb4i. Submitting to net-next as changes were needed in cxgb4/iw_cxgb4, and submitting to scsi separately would break compilation, cc-ing scsi & rdma. v2 : Cleanup macro that prints ip addresses by using %pIS in patch 3 ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/bonding')
0 files changed, 0 insertions, 0 deletions