Thu, Apr 17, 2014 at 05:01:10PM CEST, step...@networkplumber.org wrote:
>On Thu, 17 Apr 2014 14:14:29 +0200
>Jiri Pirko <j...@resnulli.us> wrote:
>
>> So this can be reused for identification of other "items" as well.
>>
>> Signed-off-by: Jiri Pirko <j...@resnulli.us>
>> ---
>> drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 2 +-
>> drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 2 +-
>> drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | 2 +-
>> include/linux/netdevice.h | 16 ++++++++--------
>> net/core/dev.c | 2 +-
>> net/core/net-sysfs.c | 2 +-
>> net/core/rtnetlink.c | 6 +++---
>> 7 files changed, 16 insertions(+), 16 deletions(-)
>>
>> diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
>> b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
>> index a78edac..a4b25b1 100644
>> --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
>> +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
>> @@ -12360,7 +12360,7 @@ static int bnx2x_validate_addr(struct net_device
>> *dev)
>> }
>>
>> static int bnx2x_get_phys_port_id(struct net_device *netdev,
>> - struct netdev_phys_port_id *ppid)
>> + struct netdev_phys_item_id *ppid)
>> {
>> struct bnx2x *bp = netdev_priv(netdev);
>>
>> diff --git a/drivers/net/ethernet/mellanox/mlx4/en_netdev.c
>> b/drivers/net/ethernet/mellanox/mlx4/en_netdev.c
>> index f085c2d..e784bb4 100644
>> --- a/drivers/net/ethernet/mellanox/mlx4/en_netdev.c
>> +++ b/drivers/net/ethernet/mellanox/mlx4/en_netdev.c
>> @@ -2251,7 +2251,7 @@ static int mlx4_en_set_vf_link_state(struct net_device
>> *dev, int vf, int link_st
>>
>> #define PORT_ID_BYTE_LEN 8
>> static int mlx4_en_get_phys_port_id(struct net_device *dev,
>> - struct netdev_phys_port_id *ppid)
>> + struct netdev_phys_item_id *ppid)
>> {
>> struct mlx4_en_priv *priv = netdev_priv(dev);
>> struct mlx4_dev *mdev = priv->mdev->dev;
>> diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
>> b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
>> index 309d056..55af16a 100644
>> --- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
>> +++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
>> @@ -450,7 +450,7 @@ static void qlcnic_82xx_cancel_idc_work(struct
>> qlcnic_adapter *adapter)
>> }
>>
>> static int qlcnic_get_phys_port_id(struct net_device *netdev,
>> - struct netdev_phys_port_id *ppid)
>> + struct netdev_phys_item_id *ppid)
>> {
>> struct qlcnic_adapter *adapter = netdev_priv(netdev);
>> struct qlcnic_hardware_context *ahw = adapter->ahw;
>> diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
>> index 775cc95..8cf4f5e 100644
>> --- a/include/linux/netdevice.h
>> +++ b/include/linux/netdevice.h
>> @@ -735,13 +735,13 @@ struct netdev_fcoe_hbainfo {
>> };
>> #endif
>>
>> -#define MAX_PHYS_PORT_ID_LEN 32
>> +#define MAX_PHYS_ITEM_ID_LEN 32
>>
>
>Why the rename?
I use the same struct in "net: introduce generic switch devices support"
to identify switch. So that is no longer only a "port id"
_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev
