diff options
| author | Doug Ledford <dledford@redhat.com> | 2016-04-28 15:16:21 -0400 |
|---|---|---|
| committer | Doug Ledford <dledford@redhat.com> | 2016-04-28 15:16:21 -0400 |
| commit | d53e181c85effdfdec97a760622330626c922d81 (patch) | |
| tree | 9df58cc9a8dd4c752cdc6f11604787a48a8e1238 /include/net/switchdev.h | |
| parent | d29c9ab1a2c81ce404883baba91e15ae35411900 (diff) | |
| parent | b75a2bf899b668b1d52de8846aafdbcf81349c73 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into testing/4.6
Diffstat (limited to 'include/net/switchdev.h')
| -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 */ |