diff options
| author | James Morris <jmorris@namei.org> | 2009-09-29 17:47:33 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2009-09-29 17:47:33 -0400 |
| commit | 1669b049db50fc7f1d4e694fb115a0f408c63fce (patch) | |
| tree | 9b3b90b5cbff9b8f30ecf0b2a44896ce8bef0c20 /net/lapb/lapb_iface.c | |
| parent | 7f366784f5c2b8fc0658b5b374f4c63ee42c789f (diff) | |
| parent | 17d857be649a21ca90008c6dc425d849fa83db5c (diff) | |
Merge branch 'master' into 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) | |||
| 407 | return lapb->callbacks.data_indication(lapb->dev, skb); | 407 | return lapb->callbacks.data_indication(lapb->dev, skb); |
| 408 | 408 | ||
| 409 | kfree_skb(skb); | 409 | kfree_skb(skb); |
| 410 | return NET_RX_CN_HIGH; /* For now; must be != NET_RX_DROP */ | 410 | return NET_RX_SUCCESS; /* For now; must be != NET_RX_DROP */ |
| 411 | } | 411 | } |
| 412 | 412 | ||
| 413 | int lapb_data_transmit(struct lapb_cb *lapb, struct sk_buff *skb) | 413 | int lapb_data_transmit(struct lapb_cb *lapb, struct sk_buff *skb) |