diff options
author | Dave Airlie <[email protected]> | 2009-11-18 10:09:55 +1000 |
---|---|---|
committer | Dave Airlie <[email protected]> | 2009-11-18 10:09:55 +1000 |
commit | 46557bef3f3834ac33031c7be27d39d90d507442 (patch) | |
tree | 5cfc4a9e1263fe0a15e516ca9695ee2f9b8899e4 /net/lapb/lapb_iface.c | |
parent | 4efc50d697ed8d9a91f0005d922907a7b6c9290d (diff) | |
parent | d91d8a3f88059d93e34ac70d059153ec69a9ffc7 (diff) |
Merge branch 'drm-core-next' of ../linux-2.6 into drm-next
Diffstat (limited to 'net/lapb/lapb_iface.c')
-rw-r--r-- | net/lapb/lapb_iface.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/lapb/lapb_iface.c b/net/lapb/lapb_iface.c index 2ba1bc4f3c3a..bda96d18fd98 100644 --- a/net/lapb/lapb_iface.c +++ b/net/lapb/lapb_iface.c @@ -407,7 +407,7 @@ int lapb_data_indication(struct lapb_cb *lapb, struct sk_buff *skb) return lapb->callbacks.data_indication(lapb->dev, skb); kfree_skb(skb); - return NET_RX_CN_HIGH; /* For now; must be != NET_RX_DROP */ + return NET_RX_SUCCESS; /* For now; must be != NET_RX_DROP */ } int lapb_data_transmit(struct lapb_cb *lapb, struct sk_buff *skb) |