Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6

[linux-2.6] / net / llc / llc_pdu.c

diff --git a/net/llc/llc_pdu.c b/net/llc/llc_pdu.c
index a28ce525d201b2061ab2d91f056f156f1d6a91ad..2e6cb79196bbbade39218cda472ece688b842a32 100644 (file)
--- a/net/llc/llc_pdu.c
+++ b/net/llc/llc_pdu.c
@@ -39,7 +39,7 @@ void llc_pdu_set_pf_bit(struct sk_buff *skb, u8 bit_value)
 
        llc_pdu_decode_pdu_type(skb, &pdu_type);
        pdu = llc_pdu_sn_hdr(skb);
-       
+
        switch (pdu_type) {
        case LLC_PDU_TYPE_I:
        case LLC_PDU_TYPE_S:
@@ -241,7 +241,7 @@ void llc_pdu_init_as_frmr_rsp(struct sk_buff *skb, struct llc_pdu_sn *prev_pdu,
        FRMR_INFO_SET_PDU_INFO_2LONG_IND(frmr_info, vzyxw);
        FRMR_INFO_SET_PDU_INVALID_Nr_IND(frmr_info, vzyxw);
        FRMR_INFO_SET_PDU_INVALID_Ns_IND(frmr_info, vzyxw);
-       skb_put(skb, 5);
+       skb_put(skb, sizeof(struct llc_frmr_info));
 }
 
 /**