Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[linux-2.6-block.git] / drivers / net / usb / lg-vl600.c

diff --git a/drivers/net/usb/lg-vl600.c b/drivers/net/usb/lg-vl600.c
index acfcc32b323d87c1b6f4e64788802af932f74319..8f37efd2d2fbb3ec05fcde896b8b9e88136c2f35 100644 (file)
--- a/drivers/net/usb/lg-vl600.c
+++ b/drivers/net/usb/lg-vl600.c
@@ -210,7 +210,7 @@ static int vl600_rx_fixup(struct usbnet *dev, struct sk_buff *skb)
                         * (0x86dd) so Linux can understand it.
                         */
                        if ((buf->data[sizeof(*ethhdr)] & 0xf0) == 0x60)
-                               ethhdr->h_proto = __constant_htons(ETH_P_IPV6);
+                               ethhdr->h_proto = htons(ETH_P_IPV6);
                }
 
                if (count) {