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/ipv4/protocol.c | |
| parent | 1c689cbcf2c2b7a35cd237abddd9206bb1b6fee1 (diff) | |
| parent | fc1caf6eafb30ea185720e29f7f5eccca61ecd60 (diff) | |
Merge branch 'master' into for-linus
Diffstat (limited to 'net/ipv4/protocol.c')
| -rw-r--r-- | net/ipv4/protocol.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/ipv4/protocol.c b/net/ipv4/protocol.c index 542f22fc98b3..f2d297351405 100644 --- a/net/ipv4/protocol.c +++ b/net/ipv4/protocol.c | |||
| @@ -52,6 +52,7 @@ int inet_add_protocol(const struct net_protocol *prot, unsigned char protocol) | |||
| 52 | 52 | ||
| 53 | return ret; | 53 | return ret; |
| 54 | } | 54 | } |
| 55 | EXPORT_SYMBOL(inet_add_protocol); | ||
| 55 | 56 | ||
| 56 | /* | 57 | /* |
| 57 | * Remove a protocol from the hash tables. | 58 | * Remove a protocol from the hash tables. |
| @@ -76,6 +77,4 @@ int inet_del_protocol(const struct net_protocol *prot, unsigned char protocol) | |||
| 76 | 77 | ||
| 77 | return ret; | 78 | return ret; |
| 78 | } | 79 | } |
| 79 | |||
| 80 | EXPORT_SYMBOL(inet_add_protocol); | ||
| 81 | EXPORT_SYMBOL(inet_del_protocol); | 80 | EXPORT_SYMBOL(inet_del_protocol); |
