diff options
| author | Chris Metcalf <cmetcalf@tilera.com> | 2010-08-06 10:37:02 -0400 |
|---|---|---|
| committer | Chris Metcalf <cmetcalf@tilera.com> | 2010-08-06 10:37:02 -0400 |
| commit | ab11b487402f97975f3ac1eeea09c82f4431481e (patch) | |
| tree | 86337c5cbbd2b0c4bd07c0847a1dc7de3d898147 /net/core/utils.c | |
| parent | 1c689cbcf2c2b7a35cd237abddd9206bb1b6fee1 (diff) | |
| parent | fc1caf6eafb30ea185720e29f7f5eccca61ecd60 (diff) | |
Merge branch 'master' into for-linus
Diffstat (limited to 'net/core/utils.c')
| -rw-r--r-- | net/core/utils.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/net/core/utils.c b/net/core/utils.c index 838250241d26..f41854470539 100644 --- a/net/core/utils.c +++ b/net/core/utils.c | |||
| @@ -77,7 +77,6 @@ __be32 in_aton(const char *str) | |||
| 77 | } | 77 | } |
| 78 | return(htonl(l)); | 78 | return(htonl(l)); |
| 79 | } | 79 | } |
| 80 | |||
| 81 | EXPORT_SYMBOL(in_aton); | 80 | EXPORT_SYMBOL(in_aton); |
| 82 | 81 | ||
| 83 | #define IN6PTON_XDIGIT 0x00010000 | 82 | #define IN6PTON_XDIGIT 0x00010000 |
| @@ -162,7 +161,6 @@ out: | |||
| 162 | *end = s; | 161 | *end = s; |
| 163 | return ret; | 162 | return ret; |
| 164 | } | 163 | } |
| 165 | |||
| 166 | EXPORT_SYMBOL(in4_pton); | 164 | EXPORT_SYMBOL(in4_pton); |
| 167 | 165 | ||
| 168 | int in6_pton(const char *src, int srclen, | 166 | int in6_pton(const char *src, int srclen, |
| @@ -280,7 +278,6 @@ out: | |||
| 280 | *end = s; | 278 | *end = s; |
| 281 | return ret; | 279 | return ret; |
| 282 | } | 280 | } |
| 283 | |||
| 284 | EXPORT_SYMBOL(in6_pton); | 281 | EXPORT_SYMBOL(in6_pton); |
| 285 | 282 | ||
| 286 | void inet_proto_csum_replace4(__sum16 *sum, struct sk_buff *skb, | 283 | void inet_proto_csum_replace4(__sum16 *sum, struct sk_buff *skb, |