Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 02637fce authored by Jiri Pirko's avatar Jiri Pirko Committed by David S. Miller
Browse files

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: default avatarJiri Pirko <jiri@resnulli.us>
Reviewed-by: default avatarThomas Graf <tgraf@suug.ch>
Acked-by: default avatarJohn Fastabend <john.r.fastabend@intel.com>
Acked-by: default avatarAndy Gospodarek <gospo@cumulusnetworks.com>
Acked-by: default avatarJamal Hadi Salim <jhs@mojatatu.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f6f6424b

drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c

+1 −1
Original line number Diff line number Diff line
@@ -12537,7 +12537,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);

drivers/net/ethernet/intel/i40e/i40e_main.c

+1 −1
Original line number Diff line number Diff line
@@ -7511,7 +7511,7 @@ static void i40e_del_vxlan_port(struct net_device *netdev, 


#endif

static int i40e_get_phys_port_id(struct net_device *netdev,

				 struct netdev_phys_port_id *ppid)

				 struct netdev_phys_item_id *ppid)

{

	struct i40e_netdev_priv *np = netdev_priv(netdev);

	struct i40e_pf *pf = np->vsi->back;

drivers/net/ethernet/mellanox/mlx4/en_netdev.c

+1 −1
Original line number Diff line number Diff line
@@ -2259,7 +2259,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;

drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c

+1 −1
Original line number Diff line number Diff line
@@ -461,7 +461,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;

include/linux/netdevice.h

+8 −8
Original line number Diff line number Diff line
@@ -754,13 +754,13 @@ struct netdev_fcoe_hbainfo { 
};

#endif



#define MAX_PHYS_PORT_ID_LEN 32

#define MAX_PHYS_ITEM_ID_LEN 32



/* This structure holds a unique identifier to identify the

 * physical port used by a netdevice.

/* This structure holds a unique identifier to identify some

 * physical item (port for example) used by a netdevice.

 */

struct netdev_phys_port_id {

	unsigned char id[MAX_PHYS_PORT_ID_LEN];

struct netdev_phys_item_id {

	unsigned char id[MAX_PHYS_ITEM_ID_LEN];

	unsigned char id_len;

};
@@ -976,7 +976,7 @@ typedef u16 (*select_queue_fallback_t)(struct net_device *dev, 
 *	USB_CDC_NOTIFY_NETWORK_CONNECTION) should NOT implement this function.

 *

 * int (*ndo_get_phys_port_id)(struct net_device *dev,

 *			       struct netdev_phys_port_id *ppid);

 *			       struct netdev_phys_item_id *ppid);

 *	Called to get ID of physical port of this device. If driver does

 *	not implement this, it is assumed that the hw is not able to have

 *	multiple net devices on single physical port.
@@ -1152,7 +1152,7 @@ struct net_device_ops { 
	int			(*ndo_change_carrier)(struct net_device *dev,

						      bool new_carrier);

	int			(*ndo_get_phys_port_id)(struct net_device *dev,

							struct netdev_phys_port_id *ppid);

							struct netdev_phys_item_id *ppid);

	void			(*ndo_add_vxlan_port)(struct  net_device *dev,

						      sa_family_t sa_family,

						      __be16 port);
@@ -2870,7 +2870,7 @@ void dev_set_group(struct net_device *, int); 
int dev_set_mac_address(struct net_device *, struct sockaddr *);

int dev_change_carrier(struct net_device *, bool new_carrier);

int dev_get_phys_port_id(struct net_device *dev,

			 struct netdev_phys_port_id *ppid);

			 struct netdev_phys_item_id *ppid);

struct sk_buff *validate_xmit_skb_list(struct sk_buff *skb, struct net_device *dev);

struct sk_buff *dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev,

				    struct netdev_queue *txq, int *ret);