X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=drivers%2Fnet%2Fusb%2Frndis_host.c;h=524a47a2812075490ac601b93590dd06d4caeccb;hb=632b06aa2842b12c6d6a510ec080fb6ebdb38ea5;hp=a48bc0f20c1a860a66299d00391381cf58972b95;hpb=cf20662db4dfade737015036fa9c63e888350c82;p=~andy%2Flinux

diff --git a/drivers/net/usb/rndis_host.c b/drivers/net/usb/rndis_host.c
index a48bc0f20c1..524a47a2812 100644
--- a/drivers/net/usb/rndis_host.c
+++ b/drivers/net/usb/rndis_host.c
@@ -492,6 +492,10 @@ EXPORT_SYMBOL_GPL(rndis_unbind);
  */
 int rndis_rx_fixup(struct usbnet *dev, struct sk_buff *skb)
 {
+	/* This check is no longer done by usbnet */
+	if (skb->len < dev->net->hard_header_len)
+		return 0;
+
 	/* peripheral may have batched packets to us... */
 	while (likely(skb->len)) {
 		struct rndis_data_hdr	*hdr = (void *)skb->data;