diff options
Diffstat (limited to 'net/ipv4/fib_frontend.c')
-rw-r--r-- | net/ipv4/fib_frontend.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/net/ipv4/fib_frontend.c b/net/ipv4/fib_frontend.c index cbe3a68507cf..3854411fa37c 100644 --- a/net/ipv4/fib_frontend.c +++ b/net/ipv4/fib_frontend.c | |||
@@ -136,13 +136,13 @@ static void fib_flush(struct net *net) | |||
136 | * Find address type as if only "dev" was present in the system. If | 136 | * Find address type as if only "dev" was present in the system. If |
137 | * on_dev is NULL then all interfaces are taken into consideration. | 137 | * on_dev is NULL then all interfaces are taken into consideration. |
138 | */ | 138 | */ |
139 | static inline unsigned __inet_dev_addr_type(struct net *net, | 139 | static inline unsigned int __inet_dev_addr_type(struct net *net, |
140 | const struct net_device *dev, | 140 | const struct net_device *dev, |
141 | __be32 addr) | 141 | __be32 addr) |
142 | { | 142 | { |
143 | struct flowi4 fl4 = { .daddr = addr }; | 143 | struct flowi4 fl4 = { .daddr = addr }; |
144 | struct fib_result res; | 144 | struct fib_result res; |
145 | unsigned ret = RTN_BROADCAST; | 145 | unsigned int ret = RTN_BROADCAST; |
146 | struct fib_table *local_table; | 146 | struct fib_table *local_table; |
147 | 147 | ||
148 | if (ipv4_is_zeronet(addr) || ipv4_is_lbcast(addr)) | 148 | if (ipv4_is_zeronet(addr) || ipv4_is_lbcast(addr)) |
@@ -740,7 +740,7 @@ void fib_del_ifaddr(struct in_ifaddr *ifa, struct in_ifaddr *iprim) | |||
740 | #define BRD_OK 2 | 740 | #define BRD_OK 2 |
741 | #define BRD0_OK 4 | 741 | #define BRD0_OK 4 |
742 | #define BRD1_OK 8 | 742 | #define BRD1_OK 8 |
743 | unsigned ok = 0; | 743 | unsigned int ok = 0; |
744 | int subnet = 0; /* Primary network */ | 744 | int subnet = 0; /* Primary network */ |
745 | int gone = 1; /* Address is missing */ | 745 | int gone = 1; /* Address is missing */ |
746 | int same_prefsrc = 0; /* Another primary with same IP */ | 746 | int same_prefsrc = 0; /* Another primary with same IP */ |