apfs/linux-apfs
0
0
Fork 0
mirror of https://github.com/linux-apfs/linux-apfs.git synced 2026-05-01 15:00:59 -07:00
Code Issues Packages Projects Releases Wiki Activity

staging: vt6656: remove redundant IWEVCUSTOM events.

Browse Source 
Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Malcolm Priestley
2012-11-24 14:47:11 +00:00
committed by Greg Kroah-Hartman
parent 7055a0751a
commit 179f823dab
3 changed files with 2 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/staging/vt6656/bssdb.c
-8
View File
@@ -925,14 +925,6 @@ if(pDevice->byReAssocCount > 0) {
pDevice->byReAssocCount = 0; pDevice->byReAssocCount = 0;
} }
if((pMgmt->eCurrState!=WMAC_STATE_ASSOC) &&
(pMgmt->eLastState==WMAC_STATE_ASSOC))
{
union iwreq_data wrqu;
memset(&wrqu, 0, sizeof(wrqu));
wrqu.data.flags = RT_DISCONNECTED_EVENT_FLAG;
wireless_send_event(pDevice->dev, IWEVCUSTOM, &wrqu, NULL);
}
pMgmt->eLastState = pMgmt->eCurrState ; pMgmt->eLastState = pMgmt->eCurrState ;
s_uCalculateLinkQual((void *)pDevice); s_uCalculateLinkQual((void *)pDevice);
drivers/staging/vt6656/iwctl.c
-7
View File
@@ -181,7 +181,6 @@ int iwctl_giwscan(struct net_device *dev, struct iw_request_info *info,
char *current_val = NULL; char *current_val = NULL;
struct iw_event iwe; struct iw_event iwe;
long ldBm; long ldBm;
char buf[MAX_WPA_IE_LEN * 2 + 30];
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCGIWSCAN\n"); DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCGIWSCAN\n");
@@ -286,12 +285,6 @@ int iwctl_giwscan(struct net_device *dev, struct iw_request_info *info,
if ((current_val - current_ev) > IW_EV_LCP_LEN) if ((current_val - current_ev) > IW_EV_LCP_LEN)
current_ev = current_val; current_ev = current_val;
memset(&iwe, 0, sizeof(iwe));
iwe.cmd = IWEVCUSTOM;
sprintf(buf, "bcn_int=%d", pBSS->wBeaconInterval);
iwe.u.data.length = strlen(buf);
current_ev = iwe_stream_add_point(info, current_ev, end_buf, &iwe, buf);
if ((pBSS->wWPALen > 0) && (pBSS->wWPALen <= MAX_WPA_IE_LEN)) { if ((pBSS->wWPALen > 0) && (pBSS->wWPALen <= MAX_WPA_IE_LEN)) {
memset(&iwe, 0, sizeof(iwe)); memset(&iwe, 0, sizeof(iwe));
iwe.cmd = IWEVGENIE; iwe.cmd = IWEVGENIE;
drivers/staging/vt6656/main_usb.c
+2 -34
View File
@@ -722,17 +722,6 @@ vt6656_probe(struct usb_interface *intf, const struct usb_device_id *id)
usb_device_reset(pDevice); usb_device_reset(pDevice);
{
union iwreq_data wrqu;
memset(&wrqu, 0, sizeof(wrqu));
wrqu.data.flags = RT_INSMOD_EVENT_FLAG;
wrqu.data.length = IFNAMSIZ;
wireless_send_event(pDevice->dev,
IWEVCUSTOM,
&wrqu,
pDevice->dev->name);
}
return 0; return 0;
err_netdev: err_netdev:
@@ -1052,15 +1041,8 @@ static int device_open(struct net_device *dev) {
netif_stop_queue(pDevice->dev); netif_stop_queue(pDevice->dev);
pDevice->flags |= DEVICE_FLAGS_OPENED; pDevice->flags |= DEVICE_FLAGS_OPENED;
{ DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "device_open success..\n");
union iwreq_data wrqu; return 0;
memset(&wrqu, 0, sizeof(wrqu));
wrqu.data.flags = RT_UPDEV_EVENT_FLAG;
wireless_send_event(pDevice->dev, IWEVCUSTOM, &wrqu, NULL);
}
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "device_open success.. \n");
return 0;
free_all: free_all:
device_free_frag_bufs(pDevice); device_free_frag_bufs(pDevice);
@@ -1089,13 +1071,6 @@ static int device_close(struct net_device *dev) {
if (pDevice == NULL) if (pDevice == NULL)
return -ENODEV; return -ENODEV;
{
union iwreq_data wrqu;
memset(&wrqu, 0, sizeof(wrqu));
wrqu.data.flags = RT_DOWNDEV_EVENT_FLAG;
wireless_send_event(pDevice->dev, IWEVCUSTOM, &wrqu, NULL);
}
if (pDevice->bLinkPass) { if (pDevice->bLinkPass) {
bScheduleCommand((void *) pDevice, WLAN_CMD_DISASSOCIATE, NULL); bScheduleCommand((void *) pDevice, WLAN_CMD_DISASSOCIATE, NULL);
mdelay(30); mdelay(30);
@@ -1166,13 +1141,6 @@ static void vt6656_disconnect(struct usb_interface *intf)
if (!device) if (!device)
return; return;
{
union iwreq_data req;
memset(&req, 0, sizeof(req));
req.data.flags = RT_RMMOD_EVENT_FLAG;
wireless_send_event(device->dev, IWEVCUSTOM, &req, NULL);
}
usb_set_intfdata(intf, NULL); usb_set_intfdata(intf, NULL);
usb_put_dev(interface_to_usbdev(intf)); usb_put_dev(interface_to_usbdev(intf));