aboutsummaryrefslogtreecommitdiffstats
path: root/net/llc/llc_output.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-09-26 21:33:26 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2005-09-26 21:33:26 -0400
commit5c1f4cac6ff75a4a602bae960a054ed3df7e9765 (patch)
tree31b0b05a41345e9dbf802a309ddf21eb506e8550 /net/llc/llc_output.c
parentc6a519d2aac024d8ca5658bddd78af474b274e4b (diff)
parent56e9b263242ca80a70abd8831343b268315c27dc (diff)
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'net/llc/llc_output.c')
-rw-r--r--net/llc/llc_output.c2
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}