aboutsummaryrefslogtreecommitdiffstats
path: root/net/mpls/af_mpls.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2015-03-05 15:11:57 -0500
committerDavid S. Miller <davem@davemloft.net>2015-03-05 15:11:57 -0500
commit0e9974f7272784fdc63a0ce9bd415ed24f1e958b (patch)
tree24472433ad14872d1ae55a1346b5030c74de1a48 /net/mpls/af_mpls.c
parentbridge: Extend Proxy ARP design to allow optional rules for Wi-Fi (diff)
parentcxgb4: Try and provide an RDMA CIQ per cpu (diff)
downloadlinux-dev-0e9974f7272784fdc63a0ce9bd415ed24f1e958b.tar.xz
linux-dev-0e9974f7272784fdc63a0ce9bd415ed24f1e958b.zip
Merge branch 'cxgb4-next'
Hariprasad Shenai says: ==================== cxgb4: RX Queue related cleanup and fixes This patch series adds a common function to allocate RX queues and queue allocation changes to RDMA CIQ The patches series is created against 'net-next' tree. And includes patches on cxgb4 driver. We have included all the maintainers of respective drivers. Kindly review the change and let us know in case of any review comments. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/mpls/af_mpls.c')
0 files changed, 0 insertions, 0 deletions