diff --git a/[refs] b/[refs] index 793dc4b6c5e2..81e7ebf0eba9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 49ae25b03c8622e381e4e54d066cd4ee2dbcc3e2 +refs/heads/master: 127a479442790d175811547dd95241dce9812ec5 diff --git a/trunk/drivers/net/usb/net1080.c b/trunk/drivers/net/usb/net1080.c index 29e06e1a34f4..c062a3e8295c 100644 --- a/trunk/drivers/net/usb/net1080.c +++ b/trunk/drivers/net/usb/net1080.c @@ -417,12 +417,9 @@ static int net1080_rx_fixup(struct usbnet *dev, struct sk_buff *skb) u16 hdr_len, packet_len; if (!(skb->len & 0x01)) { -#ifdef DEBUG - struct net_device *net = dev->net; netdev_dbg(dev->net, "rx framesize %d range %d..%d mtu %d\n", - skb->len, net->hard_header_len, dev->hard_mtu, - net->mtu); -#endif + skb->len, dev->net->hard_header_len, dev->hard_mtu, + dev->net->mtu); dev->net->stats.rx_frame_errors++; nc_ensure_sync(dev); return 0;