diff options
| author | James Morris <james.l.morris@oracle.com> | 2014-11-19 05:32:12 -0500 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2014-11-19 05:32:12 -0500 |
| commit | b10778a00d40b3d9fdaaf5891e802794781ff71c (patch) | |
| tree | 6ba4cbac86eecedc3f30650e7f764ecf00c83898 /net/irda/irlap_frame.c | |
| parent | 594081ee7145cc30a3977cb4e218f81213b63dc5 (diff) | |
| parent | bfe01a5ba2490f299e1d2d5508cbbbadd897bbe9 (diff) | |
Merge commit 'v3.17' into next
Diffstat (limited to 'net/irda/irlap_frame.c')
| -rw-r--r-- | net/irda/irlap_frame.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/irda/irlap_frame.c b/net/irda/irlap_frame.c index 9ea0c933b9ff..a37998c6273d 100644 --- a/net/irda/irlap_frame.c +++ b/net/irda/irlap_frame.c | |||
| @@ -622,7 +622,7 @@ void irlap_send_rd_frame(struct irlap_cb *self) | |||
| 622 | frame = (struct rd_frame *)skb_put(tx_skb, 2); | 622 | frame = (struct rd_frame *)skb_put(tx_skb, 2); |
| 623 | 623 | ||
| 624 | frame->caddr = self->caddr; | 624 | frame->caddr = self->caddr; |
| 625 | frame->caddr = RD_RSP | PF_BIT; | 625 | frame->control = RD_RSP | PF_BIT; |
| 626 | 626 | ||
| 627 | irlap_queue_xmit(self, tx_skb); | 627 | irlap_queue_xmit(self, tx_skb); |
| 628 | } | 628 | } |