patch-2.4.19 linux-2.4.19/drivers/usb/usbnet.c
Next file: linux-2.4.19/drivers/usb/usbvideo.c
Previous file: linux-2.4.19/drivers/usb/usbmouse.c
Back to the patch index
Back to the overall index
- Lines: 52
- Date:
Fri Aug 2 17:39:45 2002
- Orig file:
linux-2.4.18/drivers/usb/usbnet.c
- Orig date:
Mon Feb 25 11:38:07 2002
diff -urN linux-2.4.18/drivers/usb/usbnet.c linux-2.4.19/drivers/usb/usbnet.c
@@ -518,25 +518,25 @@
// allocate the skb for the individual packet
gl_skb = alloc_skb (size, GFP_ATOMIC);
- if (gl_skb == 0)
- return 0;
+ if (gl_skb) {
- // copy the packet data to the new skb
- memcpy (gl_skb->data, packet->packet_data, size);
+ // copy the packet data to the new skb
+ memcpy (gl_skb->data, packet->packet_data, size);
- // set skb data size
- gl_skb->len = size;
- gl_skb->dev = &dev->net;
+ // set skb data size
+ gl_skb->len = size;
+ gl_skb->dev = &dev->net;
- // determine the packet's protocol ID
- gl_skb->protocol = eth_type_trans (gl_skb, &dev->net);
+ // determine the packet's protocol ID
+ gl_skb->protocol = eth_type_trans (gl_skb, &dev->net);
- // update the status
- dev->stats.rx_packets++;
- dev->stats.rx_bytes += size;
+ // update the status
+ dev->stats.rx_packets++;
+ dev->stats.rx_bytes += size;
- // notify os of the received packet
- status = netif_rx (gl_skb);
+ // notify os of the received packet
+ status = netif_rx (gl_skb);
+ }
// advance to the next packet
packet = (struct gl_packet *)
@@ -989,9 +989,8 @@
|| skb->len > FRAMED_SIZE (dev->net.mtu)) {
dev->stats.rx_frame_errors++;
dbg ("rx framesize %d range %d..%d mtu %d", skb->len,
- MIN_FRAMED, FRAMED_SIZE (dev->net.mtu),
- dev->net.mtu
- );
+ (int)MIN_FRAMED, (int)FRAMED_SIZE (dev->net.mtu),
+ dev->net.mtu);
return 0;
}
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)