diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-04-11 12:39:07 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-04-11 12:39:07 +1000 |
| commit | b0f523dece4a0c82de119bf575740a70b3750bd9 (patch) | |
| tree | 9e4c855d4bf47d24fe2a4d7429fc4c215570da8d /net | |
| parent | fd64a5a342566159cb46278d88059fb2fccf08ab (diff) | |
| parent | 6c655db070ad0e43f66b45fed4c526d6aac07107 (diff) | |
Merge remote-tracking branch 'trivial/for-next'
Conflicts:
drivers/net/wireless/ath/ath9k/phy.h
Diffstat (limited to 'net')
| -rw-r--r-- | net/netfilter/ipset/ip_set_bitmap_ip.c | 2 | ||||
| -rw-r--r-- | net/sunrpc/addr.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/net/netfilter/ipset/ip_set_bitmap_ip.c b/net/netfilter/ipset/ip_set_bitmap_ip.c index a113ff066928..ba2d16607f48 100644 --- a/net/netfilter/ipset/ip_set_bitmap_ip.c +++ b/net/netfilter/ipset/ip_set_bitmap_ip.c @@ -293,7 +293,7 @@ bitmap_ip_uadt(struct ip_set *set, struct nlattr *tb[], for (; !before(ip_to, ip); ip += map->hosts) { id = ip_to_id(map, ip); - ret = adtfn(set, &id, timeout);; + ret = adtfn(set, &id, timeout); if (ret && !ip_set_eexist(ret, flags)) return ret; diff --git a/net/sunrpc/addr.c b/net/sunrpc/addr.c index 1419d0cdbbac..4195233c4914 100644 --- a/net/sunrpc/addr.c +++ b/net/sunrpc/addr.c @@ -151,7 +151,7 @@ static size_t rpc_pton4(const char *buf, const size_t buflen, return 0; sin->sin_family = AF_INET; - return sizeof(struct sockaddr_in);; + return sizeof(struct sockaddr_in); } #if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE) |