diff options
author | Ingo Molnar <mingo@kernel.org> | 2015-05-17 07:57:31 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2015-05-17 07:57:31 +0200 |
commit | 75d95d84888cbd0024eb62ca7e72b3f7fe67dbdd (patch) | |
tree | 7167fa30a5c46766c10c4b9a37d7bf9373c26c6d /net/ieee802154/nl802154.c | |
parent | 52648e83c9a6b9f7fc3dd272d4d10175e93aa62a (diff) | |
parent | c0655fe9b0901a968800f56687be3c62b4cce5d2 (diff) |
Merge branch 'linus' into x86/asm, to resolve conflicts
Conflicts:
tools/testing/selftests/x86/Makefile
tools/testing/selftests/x86/run_x86_tests.sh
Diffstat (limited to 'net/ieee802154/nl802154.c')
-rw-r--r-- | net/ieee802154/nl802154.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ieee802154/nl802154.c b/net/ieee802154/nl802154.c index a4daf91b8d0a..f3c12f6a4a39 100644 --- a/net/ieee802154/nl802154.c +++ b/net/ieee802154/nl802154.c @@ -589,7 +589,7 @@ static int nl802154_new_interface(struct sk_buff *skb, struct genl_info *info) return rdev_add_virtual_intf(rdev, nla_data(info->attrs[NL802154_ATTR_IFNAME]), - type, extended_addr); + NET_NAME_USER, type, extended_addr); } static int nl802154_del_interface(struct sk_buff *skb, struct genl_info *info) |