openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

staging: gdm72xx: Removed commented-out code 

Signed-off-by: Michalis Pappas <mpappas@fastmail.fm>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Michalis Pappas 2014-05-09 18:08:26 +08:00 committed by Greg Kroah-Hartman
parent 71fd11e1a0
commit b268666f6b
4 changed files with 1 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/staging/gdm72xx/gdm_qos.h
View File

@ -34,23 +34,6 @@
#define IEEE802_1QVLANID 0x10 #define IEEE802_1QVLANID 0x10
struct gdm_wimax_csr_s { struct gdm_wimax_csr_s {
/* union{
U16 all;
struct _CS_CLASSIFIER_RULE_ENABLE{
IPTypeOfService:1,
Protocol:1,
IPMaskedSrcAddress:1,
IPMaskedDstAddress:1,
ProtocolSrcPortRange:1,
ProtocolDstPortRange:1,
DstMacAddr:1,
SrcMacAddr:1,
Ethertype:1,
IEEE802_1DUserPriority:1,
IEEE802_1QVLANID:1,
Reserved:5;
} fields;
} */
BOOLEAN enabled; BOOLEAN enabled;
u32 SFID; u32 SFID;
u8 qos_buf_count; u8 qos_buf_count;

4
drivers/staging/gdm72xx/gdm_wimax.c
View File

@ -862,10 +862,6 @@ static void prepare_rx_complete(void *arg, void *data, int len)
netdev_err(nic->netdev, netdev_err(nic->netdev,
"get_prepared_info failed(%d)\n", ret); "get_prepared_info failed(%d)\n", ret);
gdm_wimax_rcv_with_cb(nic, prepare_rx_complete, nic); gdm_wimax_rcv_with_cb(nic, prepare_rx_complete, nic);
#if 0
/* Re-prepare WiMax device */
gdm_wimax_prepare_device(nic->netdev);
#endif
} }
} }

6
drivers/staging/gdm72xx/gdm_wimax.h
View File

@ -23,10 +23,6 @@
#define DRIVER_VERSION "3.2.3" #define DRIVER_VERSION "3.2.3"
/*#define ETH_P_IP 0x0800 */
/*#define ETH_P_ARP 0x0806 */
/*#define ETH_P_IPV6 0x86DD */
#define H2L(x) __cpu_to_le16(x) #define H2L(x) __cpu_to_le16(x)
#define L2H(x) __le16_to_cpu(x) #define L2H(x) __le16_to_cpu(x)
#define DH2L(x) __cpu_to_le32(x) #define DH2L(x) __cpu_to_le32(x)
@ -62,8 +58,6 @@ struct nic {
}; };
/*#define LOOPBACK_TEST */
int register_wimax_device(struct phy_dev *phy_dev, struct device *pdev); int register_wimax_device(struct phy_dev *phy_dev, struct device *pdev);
int gdm_wimax_send_tx(struct sk_buff *skb, struct net_device *dev); int gdm_wimax_send_tx(struct sk_buff *skb, struct net_device *dev);
void unregister_wimax_device(struct phy_dev *phy_dev); void unregister_wimax_device(struct phy_dev *phy_dev);

17
drivers/staging/gdm72xx/usb_boot.c
View File

@ -169,14 +169,7 @@ int usb_boot(struct usb_device *usbdev, u16 pid)
memcpy(&hdr, firm->data, sizeof(hdr)); memcpy(&hdr, firm->data, sizeof(hdr));
array_le32_to_cpu((u32 *)&hdr, 19); array_le32_to_cpu((u32 *)&hdr, 19);
#if 0
if (hdr.magic_code != 0x10767fff) {
dev_err(&usbdev->dev, "Invalid magic code 0x%08x\n",
hdr.magic_code);
ret = -EINVAL;
goto out;
}
#endif
if (hdr.count > MAX_IMG_CNT) { if (hdr.count > MAX_IMG_CNT) {
dev_err(&usbdev->dev, "Too many images. %d\n", hdr.count); dev_err(&usbdev->dev, "Too many images. %d\n", hdr.count);
ret = -EINVAL; ret = -EINVAL;
@ -201,14 +194,6 @@ int usb_boot(struct usb_device *usbdev, u16 pid)
memcpy(&fw_info, firm->data + pos, sizeof(fw_info)); memcpy(&fw_info, firm->data + pos, sizeof(fw_info));
array_le32_to_cpu((u32 *)&fw_info, 8); array_le32_to_cpu((u32 *)&fw_info, 8);
#if 0
if ((fw_info.id & 0xfffff000) != 0x10767000) {
dev_err(&usbdev->dev, "Invalid FW id. 0x%08x\n",
fw_info.id);
ret = -EIO;
goto out;
}
#endif
if ((fw_info.id & 0xffff) != pid) if ((fw_info.id & 0xffff) != pid)
continue; continue;