| if_upgt.c (256281) | if_upgt.c (259453) |
|---|---|
| 1/* $OpenBSD: if_upgt.c,v 1.35 2008/04/16 18:32:15 damien Exp $ */ | 1/* $OpenBSD: if_upgt.c,v 1.35 2008/04/16 18:32:15 damien Exp $ */ |
| 2/* $FreeBSD: stable/10/sys/dev/usb/wlan/if_upgt.c 253340 2013-07-14 18:26:47Z rpaulo $ */ | 2/* $FreeBSD: stable/10/sys/dev/usb/wlan/if_upgt.c 259453 2013-12-16 08:10:38Z hselasky $ */ |
| 3 4/* 5 * Copyright (c) 2007 Marcus Glocker <mglocker@openbsd.org> 6 * 7 * Permission to use, copy, modify, and distribute this software for any 8 * purpose with or without fee is hereby granted, provided that the above 9 * copyright notice and this permission notice appear in all copies. 10 * --- 1024 unchanged lines hidden (view full) --- 1035 if (!TAILQ_EMPTY(&ic->ic_vaps)) /* only one at a time */ 1036 return NULL; 1037 uvp = (struct upgt_vap *) malloc(sizeof(struct upgt_vap), 1038 M_80211_VAP, M_NOWAIT | M_ZERO); 1039 if (uvp == NULL) 1040 return NULL; 1041 vap = &uvp->vap; 1042 /* enable s/w bmiss handling for sta mode */ | 3 4/* 5 * Copyright (c) 2007 Marcus Glocker <mglocker@openbsd.org> 6 * 7 * Permission to use, copy, modify, and distribute this software for any 8 * purpose with or without fee is hereby granted, provided that the above 9 * copyright notice and this permission notice appear in all copies. 10 * --- 1024 unchanged lines hidden (view full) --- 1035 if (!TAILQ_EMPTY(&ic->ic_vaps)) /* only one at a time */ 1036 return NULL; 1037 uvp = (struct upgt_vap *) malloc(sizeof(struct upgt_vap), 1038 M_80211_VAP, M_NOWAIT | M_ZERO); 1039 if (uvp == NULL) 1040 return NULL; 1041 vap = &uvp->vap; 1042 /* enable s/w bmiss handling for sta mode */ |
| 1043 ieee80211_vap_setup(ic, vap, name, unit, opmode, 1044 flags | IEEE80211_CLONE_NOBEACONS, bssid, mac); | |
| 1045 | 1043 |
| 1044 if (ieee80211_vap_setup(ic, vap, name, unit, opmode, 1045 flags | IEEE80211_CLONE_NOBEACONS, bssid, mac) != 0) { 1046 /* out of memory */ 1047 free(uvp, M_80211_VAP); 1048 return (NULL); 1049 } 1050 |
|
| 1046 /* override state transition machine */ 1047 uvp->newstate = vap->iv_newstate; 1048 vap->iv_newstate = upgt_newstate; 1049 1050 /* setup device rates */ 1051 upgt_setup_rates(vap, ic); 1052 1053 /* complete setup */ --- 1393 unchanged lines hidden --- | 1051 /* override state transition machine */ 1052 uvp->newstate = vap->iv_newstate; 1053 vap->iv_newstate = upgt_newstate; 1054 1055 /* setup device rates */ 1056 upgt_setup_rates(vap, ic); 1057 1058 /* complete setup */ --- 1393 unchanged lines hidden --- |