Commit 6b6e2725 authored by stephen hemminger's avatar stephen hemminger Committed by David S. Miller
Browse files

netdev: make address const in device address management 



The internal functions for add/deleting addresses don't change
their argument.

Signed-off-by: default avatarStephen Hemminger <shemminger@vyatta.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1d3ff767

drivers/net/ethernet/intel/ixgbe/ixgbe_main.c

+2 −2
Original line number Diff line number Diff line
@@ -6890,7 +6890,7 @@ static int ixgbe_set_features(struct net_device *netdev, 


static int ixgbe_ndo_fdb_add(struct ndmsg *ndm,

			     struct net_device *dev,

			     unsigned char *addr,

			     const unsigned char *addr,

			     u16 flags)

{

	struct ixgbe_adapter *adapter = netdev_priv(dev);
@@ -6927,7 +6927,7 @@ static int ixgbe_ndo_fdb_add(struct ndmsg *ndm, 


static int ixgbe_ndo_fdb_del(struct ndmsg *ndm,

			     struct net_device *dev,

			     unsigned char *addr)

			     const unsigned char *addr)

{

	struct ixgbe_adapter *adapter = netdev_priv(dev);

	int err = -EOPNOTSUPP;

drivers/net/macvlan.c

+2 −2
Original line number Diff line number Diff line
@@ -548,7 +548,7 @@ static int macvlan_vlan_rx_kill_vid(struct net_device *dev, 


static int macvlan_fdb_add(struct ndmsg *ndm,

			   struct net_device *dev,

			   unsigned char *addr,

			   const unsigned char *addr,

			   u16 flags)

{

	struct macvlan_dev *vlan = netdev_priv(dev);
@@ -567,7 +567,7 @@ static int macvlan_fdb_add(struct ndmsg *ndm, 


static int macvlan_fdb_del(struct ndmsg *ndm,

			   struct net_device *dev,

			   unsigned char *addr)

			   const unsigned char *addr)

{

	struct macvlan_dev *vlan = netdev_priv(dev);

	int err = -EINVAL;

include/linux/netdevice.h

+14 −14
Original line number Diff line number Diff line
@@ -907,10 +907,10 @@ struct netdev_fcoe_hbainfo { 
 *	Must return >0 or -errno if it changed dev->features itself.

 *

 * int (*ndo_fdb_add)(struct ndmsg *ndm, struct net_device *dev,

 *		      unsigned char *addr, u16 flags)

 *		      const unsigned char *addr, u16 flags)

 *	Adds an FDB entry to dev for addr.

 * int (*ndo_fdb_del)(struct ndmsg *ndm, struct net_device *dev,

 *		      unsigned char *addr)

 *		      const unsigned char *addr)

 *	Deletes the FDB entry from dev coresponding to addr.

 * int (*ndo_fdb_dump)(struct sk_buff *skb, struct netlink_callback *cb,

 *		       struct net_device *dev, int idx)
@@ -1017,11 +1017,11 @@ struct net_device_ops { 


	int			(*ndo_fdb_add)(struct ndmsg *ndm,

					       struct net_device *dev,

					       unsigned char *addr,

					       const unsigned char *addr,

					       u16 flags);

	int			(*ndo_fdb_del)(struct ndmsg *ndm,

					       struct net_device *dev,

					       unsigned char *addr);

					       const unsigned char *addr);

	int			(*ndo_fdb_dump)(struct sk_buff *skb,

						struct netlink_callback *cb,

						struct net_device *dev,
@@ -2561,9 +2561,9 @@ extern void __hw_addr_flush(struct netdev_hw_addr_list *list); 
extern void __hw_addr_init(struct netdev_hw_addr_list *list);



/* Functions used for device addresses handling */

extern int dev_addr_add(struct net_device *dev, unsigned char *addr,

extern int dev_addr_add(struct net_device *dev, const unsigned char *addr,

			unsigned char addr_type);

extern int dev_addr_del(struct net_device *dev, unsigned char *addr,

extern int dev_addr_del(struct net_device *dev, const unsigned char *addr,

			unsigned char addr_type);

extern int dev_addr_add_multiple(struct net_device *to_dev,

				 struct net_device *from_dev,
@@ -2575,20 +2575,20 @@ extern void dev_addr_flush(struct net_device *dev); 
extern int dev_addr_init(struct net_device *dev);



/* Functions used for unicast addresses handling */

extern int dev_uc_add(struct net_device *dev, unsigned char *addr);

extern int dev_uc_add_excl(struct net_device *dev, unsigned char *addr);

extern int dev_uc_del(struct net_device *dev, unsigned char *addr);

extern int dev_uc_add(struct net_device *dev, const unsigned char *addr);

extern int dev_uc_add_excl(struct net_device *dev, const unsigned char *addr);

extern int dev_uc_del(struct net_device *dev, const unsigned char *addr);

extern int dev_uc_sync(struct net_device *to, struct net_device *from);

extern void dev_uc_unsync(struct net_device *to, struct net_device *from);

extern void dev_uc_flush(struct net_device *dev);

extern void dev_uc_init(struct net_device *dev);



/* Functions used for multicast addresses handling */

extern int dev_mc_add(struct net_device *dev, unsigned char *addr);

extern int dev_mc_add_global(struct net_device *dev, unsigned char *addr);

extern int dev_mc_add_excl(struct net_device *dev, unsigned char *addr);

extern int dev_mc_del(struct net_device *dev, unsigned char *addr);

extern int dev_mc_del_global(struct net_device *dev, unsigned char *addr);

extern int dev_mc_add(struct net_device *dev, const unsigned char *addr);

extern int dev_mc_add_global(struct net_device *dev, const unsigned char *addr);

extern int dev_mc_add_excl(struct net_device *dev, const unsigned char *addr);

extern int dev_mc_del(struct net_device *dev, const unsigned char *addr);

extern int dev_mc_del_global(struct net_device *dev, const unsigned char *addr);

extern int dev_mc_sync(struct net_device *to, struct net_device *from);

extern void dev_mc_unsync(struct net_device *to, struct net_device *from);

extern void dev_mc_flush(struct net_device *dev);

net/bridge/br_fdb.c

+3 −3
Original line number Diff line number Diff line
@@ -609,7 +609,7 @@ static int fdb_add_entry(struct net_bridge_port *source, const __u8 *addr, 


/* Add new permanent fdb entry with RTM_NEWNEIGH */

int br_fdb_add(struct ndmsg *ndm, struct net_device *dev,

	       unsigned char *addr, u16 nlh_flags)

	       const unsigned char *addr, u16 nlh_flags)

{

	struct net_bridge_port *p;

	int err = 0;
@@ -639,7 +639,7 @@ int br_fdb_add(struct ndmsg *ndm, struct net_device *dev, 
	return err;

}



static int fdb_delete_by_addr(struct net_bridge_port *p, u8 *addr)

static int fdb_delete_by_addr(struct net_bridge_port *p, const u8 *addr)

{

	struct net_bridge *br = p->br;

	struct hlist_head *head = &br->hash[br_mac_hash(addr)];
@@ -655,7 +655,7 @@ static int fdb_delete_by_addr(struct net_bridge_port *p, u8 *addr) 


/* Remove neighbor entry with RTM_DELNEIGH */

int br_fdb_delete(struct ndmsg *ndm, struct net_device *dev,

		  unsigned char *addr)

		  const unsigned char *addr)

{

	struct net_bridge_port *p;

	int err;

net/bridge/br_private.h

+2 −2
Original line number Diff line number Diff line
@@ -363,10 +363,10 @@ extern void br_fdb_update(struct net_bridge *br, 


extern int br_fdb_delete(struct ndmsg *ndm,

			 struct net_device *dev,

			 unsigned char *addr);

			 const unsigned char *addr);

extern int br_fdb_add(struct ndmsg *nlh,

		      struct net_device *dev,

		      unsigned char *addr,

		      const unsigned char *addr,

		      u16 nlh_flags);

extern int br_fdb_dump(struct sk_buff *skb,

		       struct netlink_callback *cb,