staging: vt6656: remove redundant IWEVCUSTOM events. (179f823d) · Commits · 戴 / test

drivers/staging/vt6656/bssdb.c

+0 −8

Original line number	Diff line number	Diff line
		@@ -925,14 +925,6 @@ if(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 ;

		s_uCalculateLinkQual((void *)pDevice);

+0 −7

Original line number	Diff line number	Diff line
		@@ -181,7 +181,6 @@ int iwctl_giwscan(struct net_device dev, struct iw_request_info info,
		char *current_val = NULL;
		struct iw_event iwe;
		long ldBm;
		char buf[MAX_WPA_IE_LEN * 2 + 30];

		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)
		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)) {
		memset(&iwe, 0, sizeof(iwe));
		iwe.cmd = IWEVGENIE;

+2 −34

Original line number	Diff line number	Diff line
		@@ -722,17 +722,6 @@ vt6656_probe(struct usb_interface intf, const struct usb_device_id id)

		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;

		err_netdev:
		@@ -1052,13 +1041,6 @@ static int device_open(struct net_device *dev) {
		netif_stop_queue(pDevice->dev);
		pDevice->flags \|= DEVICE_FLAGS_OPENED;

		{
		union iwreq_data wrqu;
		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;

		@@ -1089,13 +1071,6 @@ static int device_close(struct net_device *dev) {
		if (pDevice == NULL)
		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) {
		bScheduleCommand((void *) pDevice, WLAN_CMD_DISASSOCIATE, NULL);
		mdelay(30);
		@@ -1166,13 +1141,6 @@ static void vt6656_disconnect(struct usb_interface *intf)
		if (!device)
		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_put_dev(interface_to_usbdev(intf));