diff --git a/[refs] b/[refs] index abe514472197..61d5bd162539 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b85da2c00453d9b97e66b5be7d035d6e0736eca0 +refs/heads/master: 9c5d061429b0abc74bcd95d1896a848d1ab663b1 diff --git a/trunk/drivers/net/spider_net.c b/trunk/drivers/net/spider_net.c index 9bc6c20e8b97..1ff3491c8240 100644 --- a/trunk/drivers/net/spider_net.c +++ b/trunk/drivers/net/spider_net.c @@ -1004,9 +1004,7 @@ spider_net_pass_skb_up(struct spider_net_descr *descr, } if (data_status & SPIDER_NET_VLAN_PACKET) { - /* further enhancements: HW-accel VLAN - * vlan_hwaccel_receive_skb - */ + /* further enhancements: HW-accel VLAN */ } /* update netdevice statistics */