2 files changed, 14 insertions, 12 deletions

diff --git a/include/linux/usb/usbnet.h b/include/linux/usb/usbnet.h
index 5de7a220e986..0e5ac93bab10 100644
--- a/include/linux/usb/usbnet.h
+++ b/include/linux/usb/usbnet.h
@@ -33,6 +33,7 @@ struct usbnet {
         wait_queue_head_t       *wait;
         struct mutex            phy_mutex;
         unsigned char           suspend_count;
+        unsigned char           pkt_cnt, pkt_err;
 
         /* i/o info: pipes etc */
         unsigned                in, out;
@@ -70,6 +71,7 @@ struct usbnet {
 #               define EVENT_DEV_OPEN   7
 #               define EVENT_DEVICE_REPORT_IDLE 8
 #               define EVENT_NO_RUNTIME_PM      9
+#               define EVENT_RX_KILL    10
 };
 
 static inline struct usb_driver *driver_of(struct usb_interface *intf)
@@ -100,7 +102,6 @@ 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.
@@ -108,6 +109,7 @@ struct driver_info {
  */
 #define FLAG_MULTI_PACKET       0x2000
 #define FLAG_RX_ASSEMBLE        0x4000  /* rx packets may span >1 frames */
+#define FLAG_NOARP              0x8000  /* device can't do ARP */
 
         /* init device ... can sleep, or cause probe() failure */
         int     (*bind)(struct usbnet *, struct usb_interface *);
diff --git a/include/net/transp_v6.h b/include/net/transp_v6.h
index 498433dd067d..938b7fd11204 100644
--- a/include/net/transp_v6.h
+++ b/include/net/transp_v6.h
@@ -34,17 +34,17 @@ extern int				udpv6_connect(struct sock *sk,
                                                       struct sockaddr *uaddr,
                                                       int addr_len);
 
-extern int                      datagram_recv_ctl(struct sock *sk,
-                                                  struct msghdr *msg,
-                                                  struct sk_buff *skb);
-
-extern int                      datagram_send_ctl(struct net *net,
-                                                  struct sock *sk,
-                                                  struct msghdr *msg,
-                                                  struct flowi6 *fl6,
-                                                  struct ipv6_txoptions *opt,
-                                                  int *hlimit, int *tclass,
-                                                  int *dontfrag);
+extern int                      ip6_datagram_recv_ctl(struct sock *sk,
+                                                      struct msghdr *msg,
+                                                      struct sk_buff *skb);
+
+extern int                      ip6_datagram_send_ctl(struct net *net,
+                                                      struct sock *sk,
+                                                      struct msghdr *msg,
+                                                      struct flowi6 *fl6,
+                                                      struct ipv6_txoptions *opt,
+                                                      int *hlimit, int *tclass,
+                                                      int *dontfrag);
 
 #define         LOOPBACK4_IPV6          cpu_to_be32(0x7f000006)