Merge branch 'dsa-dont-unmask-port-bitmaps'
authorDavid S. Miller <davem@davemloft.net>
Thu, 26 Oct 2017 08:05:04 +0000 (17:05 +0900)
committerDavid S. Miller <davem@davemloft.net>
Thu, 26 Oct 2017 08:05:04 +0000 (17:05 +0900)
commit95fa7a05677e425e175cbca724acb03f15449a7a
treef2e7f6bb100b80fe2784825f7d50cc1955e86fd1
parentc3c9f441d82f0f1a1a8841201fe5ad6f9cddd040
parenteaac97466ee4e0ab6ed67afbf9fc400862e64986
Merge branch 'dsa-dont-unmask-port-bitmaps'

Vivien Didelot says:

====================
net: dsa: don't unmask port bitmaps

DSA has several bitmaps to store the type of ports: cpu_port_mask,
dsa_port_mask and enabled_port_mask. But the code is inconsistently
unmasking them.

The legacy code tries to unmask cpu_port_mask and dsa_port_mask but
skips enabled_port_mask.

The new bindings unmasks cpu_port_mask and enabled_port_mask but skips
dsa_port_mask.

In fact there is no need to unmask them because we are in the error
path, and they won't be used after. Instead of fixing the unmasking,
simply remove them.
====================

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