mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-23 17:30:02 +00:00
ipvlan: mode is u16
The mode argument was erronusly defined as u32 but it has always been u16. Also use ipvlan_set_mode() helper to set the mode instead of assigning directly. This should avoid future erronus assignments / updates. Signed-off-by: Mahesh Bandewar <maheshb@google.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
c3aaa06d5a
commit
e93fbc5a15
2 changed files with 6 additions and 4 deletions
|
@ -115,7 +115,6 @@ static inline struct ipvl_port *ipvlan_port_get_rtnl(const struct net_device *d)
|
|||
}
|
||||
|
||||
void ipvlan_adjust_mtu(struct ipvl_dev *ipvlan, struct net_device *dev);
|
||||
void ipvlan_set_port_mode(struct ipvl_port *port, u32 nval);
|
||||
void ipvlan_init_secret(void);
|
||||
unsigned int ipvlan_mac_hash(const unsigned char *addr);
|
||||
rx_handler_result_t ipvlan_handle_frame(struct sk_buff **pskb);
|
||||
|
|
|
@ -14,7 +14,7 @@ void ipvlan_adjust_mtu(struct ipvl_dev *ipvlan, struct net_device *dev)
|
|||
ipvlan->dev->mtu = dev->mtu - ipvlan->mtu_adj;
|
||||
}
|
||||
|
||||
void ipvlan_set_port_mode(struct ipvl_port *port, u32 nval)
|
||||
static void ipvlan_set_port_mode(struct ipvl_port *port, u16 nval)
|
||||
{
|
||||
struct ipvl_dev *ipvlan;
|
||||
|
||||
|
@ -442,6 +442,7 @@ static int ipvlan_link_new(struct net *src_net, struct net_device *dev,
|
|||
struct ipvl_port *port;
|
||||
struct net_device *phy_dev;
|
||||
int err;
|
||||
u16 mode = IPVLAN_MODE_L3;
|
||||
|
||||
if (!tb[IFLA_LINK])
|
||||
return -EINVAL;
|
||||
|
@ -460,10 +461,10 @@ static int ipvlan_link_new(struct net *src_net, struct net_device *dev,
|
|||
return err;
|
||||
}
|
||||
|
||||
port = ipvlan_port_get_rtnl(phy_dev);
|
||||
if (data && data[IFLA_IPVLAN_MODE])
|
||||
port->mode = nla_get_u16(data[IFLA_IPVLAN_MODE]);
|
||||
mode = nla_get_u16(data[IFLA_IPVLAN_MODE]);
|
||||
|
||||
port = ipvlan_port_get_rtnl(phy_dev);
|
||||
ipvlan->phy_dev = phy_dev;
|
||||
ipvlan->dev = dev;
|
||||
ipvlan->port = port;
|
||||
|
@ -489,6 +490,8 @@ static int ipvlan_link_new(struct net *src_net, struct net_device *dev,
|
|||
goto ipvlan_destroy_port;
|
||||
|
||||
list_add_tail_rcu(&ipvlan->pnode, &port->ipvlans);
|
||||
ipvlan_set_port_mode(port, mode);
|
||||
|
||||
netif_stacked_transfer_operstate(phy_dev, dev);
|
||||
return 0;
|
||||
|
||||
|
|
Loading…
Reference in a new issue