summaryrefslogtreecommitdiffstats
path: root/net/mpls/af_mpls.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2015-08-06 21:54:13 -0700
committerDavid S. Miller <davem@davemloft.net>2015-08-06 21:54:13 -0700
commit02b52428475672a241365910949deb6fe95d043c (patch)
tree663e59ac38e3228824ad2bbd1157a800db9df918 /net/mpls/af_mpls.c
parentff1470284493ca18da852e36afe39d29d0feb875 (diff)
parent2971ff67bd3283d187bd7a7906adfbbaad2257e1 (diff)
downloadtalos-obmc-linux-02b52428475672a241365910949deb6fe95d043c.tar.gz
talos-obmc-linux-02b52428475672a241365910949deb6fe95d043c.zip
Merge branch 'bnx2x-cnic-bnx2fc-bd-support'
Yuval Mintz says: ==================== bnx2x, cnic, bnx2fc: add support for BD Commit 230d00eb4bfe ("bnx2x: new Multi-function mode - BD") added support for a new multi-function mode, but it added only the support required by bnx2x for L2 interfaces. This adds the required changes to support the new multi-function mode in the offloaded storage protocols. Dave, Please consider applying this series to `net-next'. Do notice that this involves non-networking driver changes - but sending this as a single series seemed like the best approach as we had to have bnx2x changes to support the new functionality. If this is problematic, please tell us what's the preferred solution here. Changes from previous versions ------------------------------ - From v1 - no actual changes; v1 failed to reach netdev so in order to keep things in line I've termed this one v2. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/mpls/af_mpls.c')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud