diff options
| author | avos <avos@FreeBSD.org> | 2016-06-08 17:21:15 +0000 |
|---|---|---|
| committer | avos <avos@FreeBSD.org> | 2016-06-08 17:21:15 +0000 |
| commit | 9c33c8f38a611cd237ba6ea77def0b0928ddb50e (patch) | |
| tree | 2e336d28613f70b825d2954a00c19862459297b4 | |
| parent | 45b7f9b7090232296848e95dcb54391f6fb06002 (diff) | |
| download | FreeBSD-src-9c33c8f38a611cd237ba6ea77def0b0928ddb50e.zip FreeBSD-src-9c33c8f38a611cd237ba6ea77def0b0928ddb50e.tar.gz | |
ifconfig: fix wlan creation when unit number is not provided
(was broken after r300738).
Reported by: Yoshihiro Ota <ota@j.email.ne.jp>, adrian
Tested by: Yoshihiro Ota <ota@j.email.ne.jp>
| -rw-r--r-- | sbin/ifconfig/ifieee80211.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/sbin/ifconfig/ifieee80211.c b/sbin/ifconfig/ifieee80211.c index 82c7515..caffe79 100644 --- a/sbin/ifconfig/ifieee80211.c +++ b/sbin/ifconfig/ifieee80211.c @@ -5190,6 +5190,7 @@ static void wlan_create(int s, struct ifreq *ifr) { static const uint8_t zerobssid[IEEE80211_ADDR_LEN]; + char orig_name[IFNAMSIZ]; if (params.icp_parent[0] == '\0') errx(1, "must specify a parent device (wlandev) when creating " @@ -5201,7 +5202,13 @@ wlan_create(int s, struct ifreq *ifr) if (ioctl(s, SIOCIFCREATE2, ifr) < 0) err(1, "SIOCIFCREATE2"); + /* XXX preserve original name for ifclonecreate(). */ + strlcpy(orig_name, name, sizeof(orig_name)); + strlcpy(name, ifr->ifr_name, sizeof(name)); + setdefregdomain(s); + + strlcpy(name, orig_name, sizeof(name)); } static |
