diff options
| author |   Rémi Denis-Courmont <remi.denis-courmont@nokia.com> | 2010-01-04 02:02:47 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2010-01-07 00:24:54 -0800 |
| commit | fc6a110754476362f9f4fa3199a637f2331c5993 (patch) | |
| tree | 2b1457da4758751121ec396767e200dc2a28c2ed /net/phonet | |
| parent | drivers/net/mac8390.c: Add mac8390_init function (diff) | |
| download | linux-dev-fc6a110754476362f9f4fa3199a637f2331c5993.tar.xz linux-dev-fc6a110754476362f9f4fa3199a637f2331c5993.zip | |
Phonet: zero-copy aligned GPRS RX
Newer Nokia cellular modems can use aligned payload for their GPRS pipe.
Signed-off-by: Rémi Denis-Courmont <remi.denis-courmont@nokia.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/phonet')
| -rw-r--r-- | net/phonet/pep-gprs.c | 4 | ||||
| -rw-r--r-- | net/phonet/pep.c | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/net/phonet/pep-gprs.c b/net/phonet/pep-gprs.c index d183509d3fa6..d01208968c83 100644 --- a/net/phonet/pep-gprs.c +++ b/net/phonet/pep-gprs.c @@ -96,11 +96,11 @@ static int gprs_recv(struct gprs_dev *gp, struct sk_buff *skb) goto drop; } - if (likely(skb_headroom(skb) & 3)) { + if (skb_headroom(skb) & 3) { struct sk_buff *rskb, *fs; int flen = 0; - /* Phonet Pipe data header is misaligned (3 bytes), + /* Phonet Pipe data header may be misaligned (3 bytes), * so wrap the IP packet as a single fragment of an head-less * socket buffer. The network stack will pull what it needs, * but at least, the whole IP payload is not memcpy'd. */ diff --git a/net/phonet/pep.c b/net/phonet/pep.c index b6356f3832f6..e23e30907d34 100644 --- a/net/phonet/pep.c +++ b/net/phonet/pep.c @@ -354,6 +354,9 @@ static int pipe_do_rcv(struct sock *sk, struct sk_buff *skb) queue = &pn->ctrlreq_queue; goto queue; + case PNS_PIPE_ALIGNED_DATA: + __skb_pull(skb, 1); + /* fall through */ case PNS_PIPE_DATA: __skb_pull(skb, 3); /* Pipe data header */ if (!pn_flow_safe(pn->rx_fc)) { |