diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-04-30 12:38:01 +1000 | 
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-04-30 12:38:01 +1000 | 
| commit | 49e1900d4cc2e7bcecb681fe60f0990bec2dcce8 (patch) | |
| tree | 253801ebf57e0a23856a2c7be129c2c178f62fdf /net/tipc/config.c | |
| parent | 34f6d749c0a328817d5e36274e53121c1db734dc (diff) | |
| parent | b9099ff63c75216d6ca10bce5a1abcd9293c27e6 (diff) | |
Merge branch 'linux-2.6' into for-2.6.22
Diffstat (limited to 'net/tipc/config.c')
| -rw-r--r-- | net/tipc/config.c | 2 | 
1 files changed, 1 insertions, 1 deletions
| diff --git a/net/tipc/config.c b/net/tipc/config.c index 14789a82de5..c71337a22d3 100644 --- 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) { | 
