diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-04-10 11:46:00 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-04-10 11:46:00 -0400 |
| commit | 460fbf82c0842cad3f3c744c4dcb81978b7829f3 (patch) | |
| tree | d19b6d7d18491a8fa423f3ac9f2b422863b8c373 /drivers/char/random.c | |
| parent | 68491d5892defca59ad4f604cace2b1e30889c14 (diff) | |
| parent | b1a7ffcb7a047e99ab02424e651e0492f36095f7 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: (35 commits)
[IPV6]: Deinline few large functions in inet6 code
[IPV4] ip_fragment: Always compute hash with ipfrag_lock held.
[NETFILTER]: Fix DNAT in LOCAL_OUT
[X25]: Restore skb->dev setting in x25_type_trans().
[NET]: Fix hotplug race during device registration.
[IPV6]: Unexport secure_ipv6_port_ephemeral
[NETFILTER]: Fix build with CONFIG_NETFILTER=y/m on IA64
[NET]: More kzalloc conversions.
[NET] kzalloc: use in alloc_netdev
[PKT_SCHED] act_police: Rename methods.
[TG3]: Speed up SRAM access (2nd version)
[TG3]: Kill some less useful flags
[NETFILTER]: H.323 helper: remove changelog
[NETFILTER]: Convert conntrack/ipt_REJECT to new checksumming functions
[NETFILTER]: Add address family specific checksum helpers
[NETFILTER]: Introduce infrastructure for address family specific operations
[NETFILTER]: Fix IP_NF_CONNTRACK_NETLINK dependency
[NETFILTER]: H.323 helper: add parameter 'default_rrq_ttl'
[NETFILTER]: H.323 helper: make get_h245_addr() static
[NETFILTER]: H.323 helper: change EXPORT_SYMBOL to EXPORT_SYMBOL_GPL
...
Diffstat (limited to 'drivers/char/random.c')
| -rw-r--r-- | drivers/char/random.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/char/random.c b/drivers/char/random.c index 86be04b241..58f3512c52 100644 --- a/drivers/char/random.c +++ b/drivers/char/random.c | |||
| @@ -1584,7 +1584,6 @@ u32 secure_ipv6_port_ephemeral(const __u32 *saddr, const __u32 *daddr, __u16 dpo | |||
| 1584 | 1584 | ||
| 1585 | return twothirdsMD4Transform(daddr, hash); | 1585 | return twothirdsMD4Transform(daddr, hash); |
| 1586 | } | 1586 | } |
| 1587 | EXPORT_SYMBOL(secure_ipv6_port_ephemeral); | ||
| 1588 | #endif | 1587 | #endif |
| 1589 | 1588 | ||
| 1590 | #if defined(CONFIG_IP_DCCP) || defined(CONFIG_IP_DCCP_MODULE) | 1589 | #if defined(CONFIG_IP_DCCP) || defined(CONFIG_IP_DCCP_MODULE) |