Commit 1e785100 authored by Andrew Morton's avatar Andrew Morton Committed by Jeff Garzik

[PATCH] amd8111e retval fix

drivers/net/amd8111e.c: In function `amd8111e_vlan_rx':
drivers/net/amd8111e.c:677: warning: control reaches end of non-void function
parent 86014f1b
...@@ -670,7 +670,7 @@ This is the receive indication function for packets with vlan tag. ...@@ -670,7 +670,7 @@ This is the receive indication function for packets with vlan tag.
static int amd8111e_vlan_rx(struct amd8111e_priv *lp, struct sk_buff *skb, u16 vlan_tag) static int amd8111e_vlan_rx(struct amd8111e_priv *lp, struct sk_buff *skb, u16 vlan_tag)
{ {
#ifdef CONFIG_AMD8111E_NAPI #ifdef CONFIG_AMD8111E_NAPI
vlan_hwaccel_receive_skb(skb, lp->vlgrp,vlan_tag); return vlan_hwaccel_receive_skb(skb, lp->vlgrp,vlan_tag);
#else #else
return vlan_hwaccel_rx(skb, lp->vlgrp, vlan_tag); return vlan_hwaccel_rx(skb, lp->vlgrp, vlan_tag);
#endif /* CONFIG_AMD8111E_NAPI */ #endif /* CONFIG_AMD8111E_NAPI */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment