diff options
Diffstat (limited to 'drivers/net/usb/hso.c')
-rw-r--r-- | drivers/net/usb/hso.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/drivers/net/usb/hso.c b/drivers/net/usb/hso.c index b154a94de03..812edf85d6d 100644 --- a/drivers/net/usb/hso.c +++ b/drivers/net/usb/hso.c | |||
@@ -958,10 +958,6 @@ static void packetizeRx(struct hso_net *odev, unsigned char *ip_pkt, | |||
958 | /* Packet is complete. Inject into stack. */ | 958 | /* Packet is complete. Inject into stack. */ |
959 | /* We have IP packet here */ | 959 | /* We have IP packet here */ |
960 | odev->skb_rx_buf->protocol = cpu_to_be16(ETH_P_IP); | 960 | odev->skb_rx_buf->protocol = cpu_to_be16(ETH_P_IP); |
961 | /* don't check it */ | ||
962 | odev->skb_rx_buf->ip_summed = | ||
963 | CHECKSUM_UNNECESSARY; | ||
964 | |||
965 | skb_reset_mac_header(odev->skb_rx_buf); | 961 | skb_reset_mac_header(odev->skb_rx_buf); |
966 | 962 | ||
967 | /* Ship it off to the kernel */ | 963 | /* Ship it off to the kernel */ |
@@ -2994,12 +2990,14 @@ static int hso_probe(struct usb_interface *interface, | |||
2994 | 2990 | ||
2995 | case HSO_INTF_BULK: | 2991 | case HSO_INTF_BULK: |
2996 | /* It's a regular bulk interface */ | 2992 | /* It's a regular bulk interface */ |
2997 | if (((port_spec & HSO_PORT_MASK) == HSO_PORT_NETWORK) && | 2993 | if ((port_spec & HSO_PORT_MASK) == HSO_PORT_NETWORK) { |
2998 | !disable_net) | 2994 | if (!disable_net) |
2999 | hso_dev = hso_create_net_device(interface, port_spec); | 2995 | hso_dev = |
3000 | else | 2996 | hso_create_net_device(interface, port_spec); |
2997 | } else { | ||
3001 | hso_dev = | 2998 | hso_dev = |
3002 | hso_create_bulk_serial_device(interface, port_spec); | 2999 | hso_create_bulk_serial_device(interface, port_spec); |
3000 | } | ||
3003 | if (!hso_dev) | 3001 | if (!hso_dev) |
3004 | goto exit; | 3002 | goto exit; |
3005 | break; | 3003 | break; |