Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/pci-2.6

[~andy/linux] / net / tipc / config.c

diff --git a/net/tipc/config.c b/net/tipc/config.c
index 14789a82de537b6629383ec37af4ec6d6b5c81dc..c71337a22d337acb9a8df8c6b0b1321f331d6935 100644 (file)
--- a/net/tipc/config.c
+++ b/net/tipc/config.c
@@ -89,7 +89,7 @@ struct sk_buff *tipc_cfg_reply_alloc(int payload_size)
 int tipc_cfg_append_tlv(struct sk_buff *buf, int tlv_type,
                        void *tlv_data, int tlv_data_size)
 {
-       struct tlv_desc *tlv = (struct tlv_desc *)buf->tail;
+       struct tlv_desc *tlv = (struct tlv_desc *)skb_tail_pointer(buf);
        int new_tlv_space = TLV_SPACE(tlv_data_size);
 
        if (skb_tailroom(buf) < new_tlv_space) {