diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2005-10-18 16:50:52 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2005-10-18 16:50:52 -0400 |
| commit | cff6bf970965c98c62007fc8a36527fd147fe233 (patch) | |
| tree | 2791f2208b54ade86625af416ff5342f11282f0c /net/llc/llc_output.c | |
| parent | 6cd7525a00f3b926e8bd2e402954ed3e09a8e924 (diff) | |
| parent | 39ca371c45b04cd50d0974030ae051906fc516b6 (diff) | |
Merge /home/trondmy/scm/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'net/llc/llc_output.c')
| -rw-r--r-- | net/llc/llc_output.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/llc/llc_output.c b/net/llc/llc_output.c index ab5784cf163e..b4d55b6abb67 100644 --- a/net/llc/llc_output.c +++ b/net/llc/llc_output.c | |||
| @@ -98,7 +98,7 @@ int llc_build_and_send_ui_pkt(struct llc_sap *sap, struct sk_buff *skb, | |||
| 98 | dsap, LLC_PDU_CMD); | 98 | dsap, LLC_PDU_CMD); |
| 99 | llc_pdu_init_as_ui_cmd(skb); | 99 | llc_pdu_init_as_ui_cmd(skb); |
| 100 | rc = llc_mac_hdr_init(skb, skb->dev->dev_addr, dmac); | 100 | rc = llc_mac_hdr_init(skb, skb->dev->dev_addr, dmac); |
| 101 | if (!rc) | 101 | if (likely(!rc)) |
| 102 | rc = dev_queue_xmit(skb); | 102 | rc = dev_queue_xmit(skb); |
| 103 | return rc; | 103 | return rc; |
| 104 | } | 104 | } |