From: David S. Miller <davem@davemloft.net>
Date: Fri, 1 May 2020 23:20:05 +0000 (-0700)
Subject: Merge branch 'net-smc-extent-buffer-mapping-and-port-handling'
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=5b95dea31636ce93660930d16172fe75589b2e70;p=linux.git

Merge branch 'net-smc-extent-buffer-mapping-and-port-handling'

Karsten Graul says:

====================
net/smc: extent buffer mapping and port handling

Add functionality to map/unmap and register/unregister memory buffers for
specific SMC-R links and for the whole link group. Prepare LLC layer messages
for the support of multiple links and extent the processing of adapter events.
And add further small preparations needed for the SMC-R failover support.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
---

5b95dea31636ce93660930d16172fe75589b2e70
diff --cc drivers/net/ethernet/freescale/enetc/enetc_qos.c
index 30fca29b27396,30fca29b27396..48e589e9d0f7c
--- a/drivers/net/ethernet/freescale/enetc/enetc_qos.c
+++ b/drivers/net/ethernet/freescale/enetc/enetc_qos.c
@@@ -1016,6 -1016,6 +1016,7 @@@ static int enetc_psfp_parse_clsflower(s
  		    !is_zero_ether_addr(match.mask->src)) {
  			NL_SET_ERR_MSG_MOD(extack,
  					   "Cannot match on both source and destination MAC");
++			err = EINVAL;
  			goto free_filter;
  		}
  
@@@ -1023,6 -1023,6 +1024,7 @@@
  			if (!is_broadcast_ether_addr(match.mask->dst)) {
  				NL_SET_ERR_MSG_MOD(extack,
  						   "Masked matching on destination MAC not supported");
++				err = EINVAL;
  				goto free_filter;
  			}
  			ether_addr_copy(filter->sid.dst_mac, match.key->dst);
@@@ -1033,6 -1033,6 +1035,7 @@@
  			if (!is_broadcast_ether_addr(match.mask->src)) {
  				NL_SET_ERR_MSG_MOD(extack,
  						   "Masked matching on source MAC not supported");
++				err = EINVAL;
  				goto free_filter;
  			}
  			ether_addr_copy(filter->sid.src_mac, match.key->src);
@@@ -1040,6 -1040,6 +1043,7 @@@
  		}
  	} else {
  		NL_SET_ERR_MSG_MOD(extack, "Unsupported, must include ETH_ADDRS");
++		err = EINVAL;
  		goto free_filter;
  	}