diff options
Diffstat (limited to 'net/ieee802154/nl-phy.c')
| -rw-r--r-- | net/ieee802154/nl-phy.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/net/ieee802154/nl-phy.c b/net/ieee802154/nl-phy.c index 1b9d25f6e898..346c6665d25e 100644 --- a/net/ieee802154/nl-phy.c +++ b/net/ieee802154/nl-phy.c | |||
| @@ -175,6 +175,7 @@ int ieee802154_add_iface(struct sk_buff *skb, struct genl_info *info) | |||
| 175 | int rc = -ENOBUFS; | 175 | int rc = -ENOBUFS; |
| 176 | struct net_device *dev; | 176 | struct net_device *dev; |
| 177 | int type = __IEEE802154_DEV_INVALID; | 177 | int type = __IEEE802154_DEV_INVALID; |
| 178 | unsigned char name_assign_type; | ||
| 178 | 179 | ||
| 179 | pr_debug("%s\n", __func__); | 180 | pr_debug("%s\n", __func__); |
| 180 | 181 | ||
| @@ -190,8 +191,10 @@ int ieee802154_add_iface(struct sk_buff *skb, struct genl_info *info) | |||
| 190 | if (devname[nla_len(info->attrs[IEEE802154_ATTR_DEV_NAME]) - 1] | 191 | if (devname[nla_len(info->attrs[IEEE802154_ATTR_DEV_NAME]) - 1] |
| 191 | != '\0') | 192 | != '\0') |
| 192 | return -EINVAL; /* phy name should be null-terminated */ | 193 | return -EINVAL; /* phy name should be null-terminated */ |
| 194 | name_assign_type = NET_NAME_USER; | ||
| 193 | } else { | 195 | } else { |
| 194 | devname = "wpan%d"; | 196 | devname = "wpan%d"; |
| 197 | name_assign_type = NET_NAME_ENUM; | ||
| 195 | } | 198 | } |
| 196 | 199 | ||
| 197 | if (strlen(devname) >= IFNAMSIZ) | 200 | if (strlen(devname) >= IFNAMSIZ) |
| @@ -221,7 +224,7 @@ int ieee802154_add_iface(struct sk_buff *skb, struct genl_info *info) | |||
| 221 | } | 224 | } |
| 222 | 225 | ||
| 223 | dev = rdev_add_virtual_intf_deprecated(wpan_phy_to_rdev(phy), devname, | 226 | dev = rdev_add_virtual_intf_deprecated(wpan_phy_to_rdev(phy), devname, |
| 224 | type); | 227 | name_assign_type, type); |
| 225 | if (IS_ERR(dev)) { | 228 | if (IS_ERR(dev)) { |
| 226 | rc = PTR_ERR(dev); | 229 | rc = PTR_ERR(dev); |
| 227 | goto nla_put_failure; | 230 | goto nla_put_failure; |
