diff options
| author |   David S. Miller <davem@davemloft.net> | 2019-01-29 21:18:54 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-01-29 21:18:54 -0800 |
| commit | eaf2a47f40f01ef793d2fc50cf03d199846013ca (patch) | |
| tree | 0646365688ca76306aaa17ce7983944f5ec411b0 /net/rose/rose_route.c | |
| parent | cxgb4: cxgb4_tc_u32: use struct_size() in kvzalloc() (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
| download | linux-dev-eaf2a47f40f01ef793d2fc50cf03d199846013ca.tar.xz linux-dev-eaf2a47f40f01ef793d2fc50cf03d199846013ca.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'net/rose/rose_route.c')
| -rw-r--r-- | net/rose/rose_route.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/net/rose/rose_route.c b/net/rose/rose_route.c index 77e9f85a2c92..f2ff21d7df08 100644 --- a/net/rose/rose_route.c +++ b/net/rose/rose_route.c @@ -850,6 +850,7 @@ void rose_link_device_down(struct net_device *dev) /* * Route a frame to an appropriate AX.25 connection. + * A NULL ax25_cb indicates an internally generated frame. */ int rose_route_frame(struct sk_buff *skb, ax25_cb *ax25) { @@ -867,6 +868,10 @@ int rose_route_frame(struct sk_buff *skb, ax25_cb *ax25) if (skb->len < ROSE_MIN_LEN) return res; + + if (!ax25) + return rose_loopback_queue(skb, NULL); + frametype = skb->data[2]; lci = ((skb->data[0] << 8) & 0xF00) + ((skb->data[1] << 0) & 0x0FF); if (frametype == ROSE_CALL_REQUEST && |