diff options
| author | David S. Miller <davem@davemloft.net> | 2016-04-24 21:23:38 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-04-24 21:23:38 +0300 |
| commit | 3d05a06d313d602f7cd589d5d8d45bd04902adcb (patch) | |
| tree | 3fab543500b3d8ee7ccb7def33b957e2c97886f7 /include | |
| parent | f75cfbaddeef943aed479b80415c3dcc63ff4247 (diff) | |
| parent | 45ebcce56823d14d196dbdecd26783b3d5f464a6 (diff) | |
| download | linux-3d05a06d313d602f7cd589d5d8d45bd04902adcb.tar.xz | |
Merge branch 'bridge-mdb-fixes'
Jiri Pirko says:
====================
bridge: mdb: Couple of fixes
Elad says:
This patchset fixes two problems reported by Nikolay Aleksandrov. The first
problem is that the MDB offload flag might be accesed without helding the
multicast_lock.
The second problem is that the switchdev mdb offload is deferred and
the offload bit was marked regardless if the operation succeeded or not.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/switchdev.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/net/switchdev.h b/include/net/switchdev.h index d451122e8404..51d77b2ce2b2 100644 --- a/include/net/switchdev.h +++ b/include/net/switchdev.h @@ -54,6 +54,8 @@ struct switchdev_attr { struct net_device *orig_dev; enum switchdev_attr_id id; u32 flags; + void *complete_priv; + void (*complete)(struct net_device *dev, int err, void *priv); union { struct netdev_phys_item_id ppid; /* PORT_PARENT_ID */ u8 stp_state; /* PORT_STP_STATE */ @@ -75,6 +77,8 @@ struct switchdev_obj { struct net_device *orig_dev; enum switchdev_obj_id id; u32 flags; + void *complete_priv; + void (*complete)(struct net_device *dev, int err, void *priv); }; /* SWITCHDEV_OBJ_ID_PORT_VLAN */ |