* 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux: (230 commits)
  Revert "tracing: Include module.h in define_trace.h"
  irq: don't put module.h into irq.h for tracking irqgen modules.
  bluetooth: macroize two small inlines to avoid module.h
  ip_vs.h: fix implicit use of module_get/module_put from module.h
  nf_conntrack.h: fix up fallout from implicit moduleparam.h presence
  include: replace linux/module.h with "struct module" wherever possible
  include: convert various register fcns to macros to avoid include chaining
  crypto.h: remove unused crypto_tfm_alg_modname() inline
  uwb.h: fix implicit use of asm/page.h for PAGE_SIZE
  pm_runtime.h: explicitly requires notifier.h
  linux/dmaengine.h: fix implicit use of bitmap.h and asm/page.h
  miscdevice.h: fix up implicit use of lists and types
  stop_machine.h: fix implicit use of smp.h for smp_processor_id
  of: fix implicit use of errno.h in include/linux/of.h
  of_platform.h: delete needless include <linux/module.h>
  acpi: remove module.h include from platform/aclinux.h
  miscdevice.h: delete unnecessary inclusion of module.h
  device_cgroup.h: delete needless include <linux/module.h>
  net: sch_generic remove redundant use of <linux/module.h>
  net: inet_timewait_sock doesnt need <linux/module.h>
  ...
Fix up trivial conflicts (other header files, and  removal of the ab3550 mfd driver) in
 - drivers/media/dvb/frontends/dibx000_common.c
 - drivers/media/video/{mt9m111.c,ov6650.c}
 - drivers/mfd/ab3550-core.c
 - include/linux/dmaengine.h
		
	
			
		
			
				
	
	
		
			139 lines
		
	
	
	
		
			3.4 KiB
			
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			139 lines
		
	
	
	
		
			3.4 KiB
			
		
	
	
	
		
			C
		
	
	
	
	
	
/*
 | 
						|
 *  UDPLITE     An implementation of the UDP-Lite protocol (RFC 3828).
 | 
						|
 *
 | 
						|
 *  Authors:    Gerrit Renker       <gerrit@erg.abdn.ac.uk>
 | 
						|
 *
 | 
						|
 *  Changes:
 | 
						|
 *  Fixes:
 | 
						|
 *		This program is free software; you can redistribute it and/or
 | 
						|
 *		modify it under the terms of the GNU General Public License
 | 
						|
 *		as published by the Free Software Foundation; either version
 | 
						|
 *		2 of the License, or (at your option) any later version.
 | 
						|
 */
 | 
						|
#include <linux/export.h>
 | 
						|
#include "udp_impl.h"
 | 
						|
 | 
						|
struct udp_table 	udplite_table __read_mostly;
 | 
						|
EXPORT_SYMBOL(udplite_table);
 | 
						|
 | 
						|
static int udplite_rcv(struct sk_buff *skb)
 | 
						|
{
 | 
						|
	return __udp4_lib_rcv(skb, &udplite_table, IPPROTO_UDPLITE);
 | 
						|
}
 | 
						|
 | 
						|
static void udplite_err(struct sk_buff *skb, u32 info)
 | 
						|
{
 | 
						|
	__udp4_lib_err(skb, info, &udplite_table);
 | 
						|
}
 | 
						|
 | 
						|
static const struct net_protocol udplite_protocol = {
 | 
						|
	.handler	= udplite_rcv,
 | 
						|
	.err_handler	= udplite_err,
 | 
						|
	.no_policy	= 1,
 | 
						|
	.netns_ok	= 1,
 | 
						|
};
 | 
						|
 | 
						|
struct proto 	udplite_prot = {
 | 
						|
	.name		   = "UDP-Lite",
 | 
						|
	.owner		   = THIS_MODULE,
 | 
						|
	.close		   = udp_lib_close,
 | 
						|
	.connect	   = ip4_datagram_connect,
 | 
						|
	.disconnect	   = udp_disconnect,
 | 
						|
	.ioctl		   = udp_ioctl,
 | 
						|
	.init		   = udplite_sk_init,
 | 
						|
	.destroy	   = udp_destroy_sock,
 | 
						|
	.setsockopt	   = udp_setsockopt,
 | 
						|
	.getsockopt	   = udp_getsockopt,
 | 
						|
	.sendmsg	   = udp_sendmsg,
 | 
						|
	.recvmsg	   = udp_recvmsg,
 | 
						|
	.sendpage	   = udp_sendpage,
 | 
						|
	.backlog_rcv	   = udp_queue_rcv_skb,
 | 
						|
	.hash		   = udp_lib_hash,
 | 
						|
	.unhash		   = udp_lib_unhash,
 | 
						|
	.get_port	   = udp_v4_get_port,
 | 
						|
	.obj_size	   = sizeof(struct udp_sock),
 | 
						|
	.slab_flags	   = SLAB_DESTROY_BY_RCU,
 | 
						|
	.h.udp_table	   = &udplite_table,
 | 
						|
#ifdef CONFIG_COMPAT
 | 
						|
	.compat_setsockopt = compat_udp_setsockopt,
 | 
						|
	.compat_getsockopt = compat_udp_getsockopt,
 | 
						|
#endif
 | 
						|
	.clear_sk	   = sk_prot_clear_portaddr_nulls,
 | 
						|
};
 | 
						|
EXPORT_SYMBOL(udplite_prot);
 | 
						|
 | 
						|
static struct inet_protosw udplite4_protosw = {
 | 
						|
	.type		=  SOCK_DGRAM,
 | 
						|
	.protocol	=  IPPROTO_UDPLITE,
 | 
						|
	.prot		=  &udplite_prot,
 | 
						|
	.ops		=  &inet_dgram_ops,
 | 
						|
	.no_check	=  0,		/* must checksum (RFC 3828) */
 | 
						|
	.flags		=  INET_PROTOSW_PERMANENT,
 | 
						|
};
 | 
						|
 | 
						|
#ifdef CONFIG_PROC_FS
 | 
						|
 | 
						|
static const struct file_operations udplite_afinfo_seq_fops = {
 | 
						|
	.owner    = THIS_MODULE,
 | 
						|
	.open     = udp_seq_open,
 | 
						|
	.read     = seq_read,
 | 
						|
	.llseek   = seq_lseek,
 | 
						|
	.release  = seq_release_net
 | 
						|
};
 | 
						|
 | 
						|
static struct udp_seq_afinfo udplite4_seq_afinfo = {
 | 
						|
	.name		= "udplite",
 | 
						|
	.family		= AF_INET,
 | 
						|
	.udp_table 	= &udplite_table,
 | 
						|
	.seq_fops	= &udplite_afinfo_seq_fops,
 | 
						|
	.seq_ops	= {
 | 
						|
		.show		= udp4_seq_show,
 | 
						|
	},
 | 
						|
};
 | 
						|
 | 
						|
static int __net_init udplite4_proc_init_net(struct net *net)
 | 
						|
{
 | 
						|
	return udp_proc_register(net, &udplite4_seq_afinfo);
 | 
						|
}
 | 
						|
 | 
						|
static void __net_exit udplite4_proc_exit_net(struct net *net)
 | 
						|
{
 | 
						|
	udp_proc_unregister(net, &udplite4_seq_afinfo);
 | 
						|
}
 | 
						|
 | 
						|
static struct pernet_operations udplite4_net_ops = {
 | 
						|
	.init = udplite4_proc_init_net,
 | 
						|
	.exit = udplite4_proc_exit_net,
 | 
						|
};
 | 
						|
 | 
						|
static __init int udplite4_proc_init(void)
 | 
						|
{
 | 
						|
	return register_pernet_subsys(&udplite4_net_ops);
 | 
						|
}
 | 
						|
#else
 | 
						|
static inline int udplite4_proc_init(void)
 | 
						|
{
 | 
						|
	return 0;
 | 
						|
}
 | 
						|
#endif
 | 
						|
 | 
						|
void __init udplite4_register(void)
 | 
						|
{
 | 
						|
	udp_table_init(&udplite_table, "UDP-Lite");
 | 
						|
	if (proto_register(&udplite_prot, 1))
 | 
						|
		goto out_register_err;
 | 
						|
 | 
						|
	if (inet_add_protocol(&udplite_protocol, IPPROTO_UDPLITE) < 0)
 | 
						|
		goto out_unregister_proto;
 | 
						|
 | 
						|
	inet_register_protosw(&udplite4_protosw);
 | 
						|
 | 
						|
	if (udplite4_proc_init())
 | 
						|
		printk(KERN_ERR "%s: Cannot register /proc!\n", __func__);
 | 
						|
	return;
 | 
						|
 | 
						|
out_unregister_proto:
 | 
						|
	proto_unregister(&udplite_prot);
 | 
						|
out_register_err:
 | 
						|
	printk(KERN_CRIT "%s: Cannot add UDP-Lite protocol.\n", __func__);
 | 
						|
}
 |