diff options
Diffstat (limited to 'include/net/switchdev.h')
-rw-r--r-- | include/net/switchdev.h | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/include/net/switchdev.h b/include/net/switchdev.h index 63843ae5dc81..5e87b54c5dc5 100644 --- a/include/net/switchdev.h +++ b/include/net/switchdev.h | |||
@@ -43,7 +43,6 @@ static inline bool switchdev_trans_ph_commit(struct switchdev_trans *trans) | |||
43 | 43 | ||
44 | enum switchdev_attr_id { | 44 | enum switchdev_attr_id { |
45 | SWITCHDEV_ATTR_ID_UNDEFINED, | 45 | SWITCHDEV_ATTR_ID_UNDEFINED, |
46 | SWITCHDEV_ATTR_ID_PORT_PARENT_ID, | ||
47 | SWITCHDEV_ATTR_ID_PORT_STP_STATE, | 46 | SWITCHDEV_ATTR_ID_PORT_STP_STATE, |
48 | SWITCHDEV_ATTR_ID_PORT_BRIDGE_FLAGS, | 47 | SWITCHDEV_ATTR_ID_PORT_BRIDGE_FLAGS, |
49 | SWITCHDEV_ATTR_ID_PORT_BRIDGE_FLAGS_SUPPORT, | 48 | SWITCHDEV_ATTR_ID_PORT_BRIDGE_FLAGS_SUPPORT, |
@@ -61,7 +60,6 @@ struct switchdev_attr { | |||
61 | void *complete_priv; | 60 | void *complete_priv; |
62 | void (*complete)(struct net_device *dev, int err, void *priv); | 61 | void (*complete)(struct net_device *dev, int err, void *priv); |
63 | union { | 62 | union { |
64 | struct netdev_phys_item_id ppid; /* PORT_PARENT_ID */ | ||
65 | u8 stp_state; /* PORT_STP_STATE */ | 63 | u8 stp_state; /* PORT_STP_STATE */ |
66 | unsigned long brport_flags; /* PORT_BRIDGE_FLAGS */ | 64 | unsigned long brport_flags; /* PORT_BRIDGE_FLAGS */ |
67 | unsigned long brport_flags_support; /* PORT_BRIDGE_FLAGS_SUPPORT */ | 65 | unsigned long brport_flags_support; /* PORT_BRIDGE_FLAGS_SUPPORT */ |
@@ -208,9 +206,6 @@ void switchdev_port_fwd_mark_set(struct net_device *dev, | |||
208 | struct net_device *group_dev, | 206 | struct net_device *group_dev, |
209 | bool joining); | 207 | bool joining); |
210 | 208 | ||
211 | bool switchdev_port_same_parent_id(struct net_device *a, | ||
212 | struct net_device *b); | ||
213 | |||
214 | int switchdev_handle_port_obj_add(struct net_device *dev, | 209 | int switchdev_handle_port_obj_add(struct net_device *dev, |
215 | struct switchdev_notifier_port_obj_info *port_obj_info, | 210 | struct switchdev_notifier_port_obj_info *port_obj_info, |
216 | bool (*check_cb)(const struct net_device *dev), | 211 | bool (*check_cb)(const struct net_device *dev), |
@@ -295,12 +290,6 @@ call_switchdev_blocking_notifiers(unsigned long val, | |||
295 | return NOTIFY_DONE; | 290 | return NOTIFY_DONE; |
296 | } | 291 | } |
297 | 292 | ||
298 | static inline bool switchdev_port_same_parent_id(struct net_device *a, | ||
299 | struct net_device *b) | ||
300 | { | ||
301 | return false; | ||
302 | } | ||
303 | |||
304 | static inline int | 293 | static inline int |
305 | switchdev_handle_port_obj_add(struct net_device *dev, | 294 | switchdev_handle_port_obj_add(struct net_device *dev, |
306 | struct switchdev_notifier_port_obj_info *port_obj_info, | 295 | struct switchdev_notifier_port_obj_info *port_obj_info, |