diff options
author | Jiri Pirko <jiri@resnulli.us> | 2014-11-28 08:34:16 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-12-02 23:01:19 -0500 |
commit | 02637fce3e0103ba086b9c33b6d529e69460e4b6 (patch) | |
tree | 695bc5b5f7dfaf3e7d0a9a422c85f984f37bafbd /include/linux/netdevice.h | |
parent | f6f6424ba773da6221ecaaa70973eb4dacfa03b2 (diff) |
net: rename netdev_phys_port_id to more generic name
So this can be reused for identification of other "items" as well.
Signed-off-by: Jiri Pirko <jiri@resnulli.us>
Reviewed-by: Thomas Graf <tgraf@suug.ch>
Acked-by: John Fastabend <john.r.fastabend@intel.com>
Acked-by: Andy Gospodarek <gospo@cumulusnetworks.com>
Acked-by: Jamal Hadi Salim <jhs@mojatatu.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux/netdevice.h')
-rw-r--r-- | include/linux/netdevice.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index 589929cf4700..4bd41d72559d 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h | |||
@@ -754,13 +754,13 @@ struct netdev_fcoe_hbainfo { | |||
754 | }; | 754 | }; |
755 | #endif | 755 | #endif |
756 | 756 | ||
757 | #define MAX_PHYS_PORT_ID_LEN 32 | 757 | #define MAX_PHYS_ITEM_ID_LEN 32 |
758 | 758 | ||
759 | /* This structure holds a unique identifier to identify the | 759 | /* This structure holds a unique identifier to identify some |
760 | * physical port used by a netdevice. | 760 | * physical item (port for example) used by a netdevice. |
761 | */ | 761 | */ |
762 | struct netdev_phys_port_id { | 762 | struct netdev_phys_item_id { |
763 | unsigned char id[MAX_PHYS_PORT_ID_LEN]; | 763 | unsigned char id[MAX_PHYS_ITEM_ID_LEN]; |
764 | unsigned char id_len; | 764 | unsigned char id_len; |
765 | }; | 765 | }; |
766 | 766 | ||
@@ -976,7 +976,7 @@ typedef u16 (*select_queue_fallback_t)(struct net_device *dev, | |||
976 | * USB_CDC_NOTIFY_NETWORK_CONNECTION) should NOT implement this function. | 976 | * USB_CDC_NOTIFY_NETWORK_CONNECTION) should NOT implement this function. |
977 | * | 977 | * |
978 | * int (*ndo_get_phys_port_id)(struct net_device *dev, | 978 | * int (*ndo_get_phys_port_id)(struct net_device *dev, |
979 | * struct netdev_phys_port_id *ppid); | 979 | * struct netdev_phys_item_id *ppid); |
980 | * Called to get ID of physical port of this device. If driver does | 980 | * Called to get ID of physical port of this device. If driver does |
981 | * not implement this, it is assumed that the hw is not able to have | 981 | * not implement this, it is assumed that the hw is not able to have |
982 | * multiple net devices on single physical port. | 982 | * multiple net devices on single physical port. |
@@ -1152,7 +1152,7 @@ struct net_device_ops { | |||
1152 | int (*ndo_change_carrier)(struct net_device *dev, | 1152 | int (*ndo_change_carrier)(struct net_device *dev, |
1153 | bool new_carrier); | 1153 | bool new_carrier); |
1154 | int (*ndo_get_phys_port_id)(struct net_device *dev, | 1154 | int (*ndo_get_phys_port_id)(struct net_device *dev, |
1155 | struct netdev_phys_port_id *ppid); | 1155 | struct netdev_phys_item_id *ppid); |
1156 | void (*ndo_add_vxlan_port)(struct net_device *dev, | 1156 | void (*ndo_add_vxlan_port)(struct net_device *dev, |
1157 | sa_family_t sa_family, | 1157 | sa_family_t sa_family, |
1158 | __be16 port); | 1158 | __be16 port); |
@@ -2870,7 +2870,7 @@ void dev_set_group(struct net_device *, int); | |||
2870 | int dev_set_mac_address(struct net_device *, struct sockaddr *); | 2870 | int dev_set_mac_address(struct net_device *, struct sockaddr *); |
2871 | int dev_change_carrier(struct net_device *, bool new_carrier); | 2871 | int dev_change_carrier(struct net_device *, bool new_carrier); |
2872 | int dev_get_phys_port_id(struct net_device *dev, | 2872 | int dev_get_phys_port_id(struct net_device *dev, |
2873 | struct netdev_phys_port_id *ppid); | 2873 | struct netdev_phys_item_id *ppid); |
2874 | struct sk_buff *validate_xmit_skb_list(struct sk_buff *skb, struct net_device *dev); | 2874 | struct sk_buff *validate_xmit_skb_list(struct sk_buff *skb, struct net_device *dev); |
2875 | struct sk_buff *dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev, | 2875 | struct sk_buff *dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev, |
2876 | struct netdev_queue *txq, int *ret); | 2876 | struct netdev_queue *txq, int *ret); |