Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

netfilter: ipset: Coding style fixes

Signed-off-by: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>

+12 -8
+3 -2
include/linux/netfilter/ipset/ip_set.h
··· 255 255 * returns negative error code, 256 256 * zero for no match/success to add/delete 257 257 * positive for matching element */ 258 - int (*kadt)(struct ip_set *set, const struct sk_buff * skb, 258 + int (*kadt)(struct ip_set *set, const struct sk_buff *skb, 259 259 const struct xt_action_param *par, 260 260 enum ipset_adt adt, const struct ip_set_adt_opt *opt); 261 261 ··· 430 430 return ret; 431 431 } 432 432 433 - static inline int nla_put_ipaddr6(struct sk_buff *skb, int type, const struct in6_addr *ipaddrptr) 433 + static inline int nla_put_ipaddr6(struct sk_buff *skb, int type, 434 + const struct in6_addr *ipaddrptr) 434 435 { 435 436 struct nlattr *__nested = ipset_nest_start(skb, type); 436 437 int ret;
+1 -1
include/linux/netfilter/ipset/ip_set_ahash.h
··· 696 696 } 697 697 698 698 static int 699 - type_pf_kadt(struct ip_set *set, const struct sk_buff * skb, 699 + type_pf_kadt(struct ip_set *set, const struct sk_buff *skb, 700 700 const struct xt_action_param *par, 701 701 enum ipset_adt adt, const struct ip_set_adt_opt *opt); 702 702 static int
+2 -2
net/netfilter/ipset/ip_set_bitmap_ipmac.c
··· 323 323 (elem->match == MAC_FILLED && 324 324 nla_put(skb, IPSET_ATTR_ETHER, ETH_ALEN, 325 325 elem->ether))) 326 - goto nla_put_failure; 326 + goto nla_put_failure; 327 327 timeout = elem->match == MAC_UNSET ? elem->timeout 328 328 : ip_set_timeout_get(elem->timeout); 329 329 if (nla_put_net32(skb, IPSET_ATTR_TIMEOUT, htonl(timeout))) 330 - goto nla_put_failure; 330 + goto nla_put_failure; 331 331 ipset_nest_end(skb, nested); 332 332 } 333 333 ipset_nest_end(skb, atd);
+6 -3
net/netfilter/ipset/ip_set_core.c
··· 69 69 70 70 list_for_each_entry_rcu(type, &ip_set_type_list, list) 71 71 if (STREQ(type->name, name) && 72 - (type->family == family || type->family == NFPROTO_UNSPEC) && 72 + (type->family == family || 73 + type->family == NFPROTO_UNSPEC) && 73 74 revision >= type->revision_min && 74 75 revision <= type->revision_max) 75 76 return type; ··· 150 149 rcu_read_lock(); 151 150 list_for_each_entry_rcu(type, &ip_set_type_list, list) 152 151 if (STREQ(type->name, name) && 153 - (type->family == family || type->family == NFPROTO_UNSPEC)) { 152 + (type->family == family || 153 + type->family == NFPROTO_UNSPEC)) { 154 154 found = true; 155 155 if (type->revision_min < *min) 156 156 *min = type->revision_min; ··· 723 721 * by the nfnl mutex. Find the first free index in ip_set_list 724 722 * and check clashing. 725 723 */ 726 - if ((ret = find_free_id(set->name, &index, &clash)) != 0) { 724 + ret = find_free_id(set->name, &index, &clash); 725 + if (ret != 0) { 727 726 /* If this is the same set and requested, ignore error */ 728 727 if (ret == -EEXIST && 729 728 (flags & IPSET_FLAG_EXIST) &&