From 1331e5036ade03c6c130c3c150c60140ef2e8177 Mon Sep 17 00:00:00 2001
From: Wei Shuai <cpuwolf@gmail.com>
Date: Mon, 21 Jan 2013 06:00:31 +0000
Subject: [PATCH] --- yaml --- r: 349245 b: refs/heads/master c:
 6509141f9c2ba74df6cc72ec35cd1865276ae3a4 h: refs/heads/master i:   349243:
 0638893739fae901edc02b99567921e699e12ccb v: v3

---
 [refs]                           | 2 +-
 trunk/drivers/net/usb/usbnet.c   | 4 ++++
 trunk/include/linux/usb/usbnet.h | 1 +
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 4d43239285a6..b46cccb7a60c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f91f33452be939b38c3b16ba1fab35c27221e7ec
+refs/heads/master: 6509141f9c2ba74df6cc72ec35cd1865276ae3a4
diff --git a/trunk/drivers/net/usb/usbnet.c b/trunk/drivers/net/usb/usbnet.c
index 3d4bf01641b4..f34b2ebee815 100644
--- a/trunk/drivers/net/usb/usbnet.c
+++ b/trunk/drivers/net/usb/usbnet.c
@@ -1448,6 +1448,10 @@ usbnet_probe (struct usb_interface *udev, const struct usb_device_id *prod)
 		if ((dev->driver_info->flags & FLAG_WWAN) != 0)
 			strcpy(net->name, "wwan%d");
 
+		/* devices that cannot do ARP */
+		if ((dev->driver_info->flags & FLAG_NOARP) != 0)
+			net->flags |= IFF_NOARP;
+
 		/* maybe the remote can't receive an Ethernet MTU */
 		if (net->mtu > (dev->hard_mtu - net->hard_header_len))
 			net->mtu = dev->hard_mtu - net->hard_header_len;
diff --git a/trunk/include/linux/usb/usbnet.h b/trunk/include/linux/usb/usbnet.h
index bd45eb7bedc8..5de7a220e986 100644
--- a/trunk/include/linux/usb/usbnet.h
+++ b/trunk/include/linux/usb/usbnet.h
@@ -100,6 +100,7 @@ struct driver_info {
 #define FLAG_LINK_INTR	0x0800		/* updates link (carrier) status */
 
 #define FLAG_POINTTOPOINT 0x1000	/* possibly use "usb%d" names */
+#define FLAG_NOARP	0x2000		/* device can't do ARP */
 
 /*
  * Indicates to usbnet, that USB driver accumulates multiple IP packets.