Commit 2e0c17d1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (39 commits)
  gigaset: fix build failure
  bridge: Make first arg to deliver_clone const.
  bridge br_multicast: Don't refer to BR_INPUT_SKB_CB(skb)->mrouters_only without IGMP snooping.
  route: Fix caught BUG_ON during rt_secret_rebuild_oneshot()
  bridge br_multicast: Fix skb leakage in error path.
  bridge br_multicast: Fix handling of Max Response Code in IGMPv3 message.
  NET: netpoll, fix potential NULL ptr dereference
  tipc: fix lockdep warning on address assignment
  l2tp: Fix UDP socket reference count bugs in the pppol2tp driver
  smsc95xx: wait for PHY to complete reset during init
  l2tp: Fix oops in pppol2tp_xmit
  smsc75xx: SMSC LAN75xx USB gigabit ethernet adapter driver
  ne: Do not use slashes in irq name string
  NET: ksz884x, fix lock imbalance
  gigaset: correct range checking off by one error
  bridge: Fix br_forward crash in promiscuous mode
  bridge: Move NULL mdb check into br_mdb_ip_get
  ISDN: Add PCI ID for HFC-2S/4S Beronet Card PCIe
  net-2.6 [Bug-Fix][dccp]: fix oops caused after failed initialisation
  myri: remove dead code
  ...
parents 7de4a9a7 22001a13

Documentation/networking/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -6,3 +6,5 @@ hostprogs-y := ifenslave 


# Tell kbuild to always build the programs

always := $(hostprogs-y)



obj-m := timestamping/

Documentation/networking/timestamping/Makefile

+9 −2
Original line number Diff line number Diff line 
CPPFLAGS = -I../../../include

# kbuild trick to avoid linker error. Can be omitted if a module is built.

obj- := dummy.o



timestamping: timestamping.c

# List of programs to build

hostprogs-y := timestamping



# Tell kbuild to always build the programs

always := $(hostprogs-y)



HOSTCFLAGS_timestamping.o += -I$(objtree)/usr/include



clean:

	rm -f timestamping

Documentation/networking/timestamping/timestamping.c

+5 −5
Original line number Diff line number Diff line
@@ -41,9 +41,9 @@ 
#include <arpa/inet.h>

#include <net/if.h>



#include "asm/types.h"

#include "linux/net_tstamp.h"

#include "linux/errqueue.h"

#include <asm/types.h>

#include <linux/net_tstamp.h>

#include <linux/errqueue.h>



#ifndef SO_TIMESTAMPING

# define SO_TIMESTAMPING         37
@@ -164,7 +164,7 @@ static void printpacket(struct msghdr *msg, int res, 


	gettimeofday(&now, 0);



	printf("%ld.%06ld: received %s data, %d bytes from %s, %d bytes control messages\n",

	printf("%ld.%06ld: received %s data, %d bytes from %s, %zu bytes control messages\n",

	       (long)now.tv_sec, (long)now.tv_usec,

	       (recvmsg_flags & MSG_ERRQUEUE) ? "error" : "regular",

	       res,
@@ -173,7 +173,7 @@ static void printpacket(struct msghdr *msg, int res, 
	for (cmsg = CMSG_FIRSTHDR(msg);

	     cmsg;

	     cmsg = CMSG_NXTHDR(msg, cmsg)) {

		printf("   cmsg len %d: ", cmsg->cmsg_len);

		printf("   cmsg len %zu: ", cmsg->cmsg_len);

		switch (cmsg->cmsg_level) {

		case SOL_SOCKET:

			printf("SOL_SOCKET ");

drivers/atm/lanai.c

+3 −4
Original line number Diff line number Diff line
@@ -306,11 +306,10 @@ static void vci_bitfield_iterate(struct lanai_dev *lanai, 
	const unsigned long *lp,

	void (*func)(struct lanai_dev *,vci_t vci))

{

	vci_t vci = find_first_bit(lp, NUM_VCI);

	while (vci < NUM_VCI) {

	vci_t vci;



	for_each_set_bit(vci, lp, NUM_VCI)

		func(lanai, vci);

		vci = find_next_bit(lp, NUM_VCI, vci + 1);

	}

}



/* -------------------- BUFFER  UTILITIES: */

drivers/isdn/gigaset/capi.c

+26 −20
Original line number Diff line number Diff line
@@ -1301,7 +1301,7 @@ static void do_connect_req(struct gigaset_capi_ctr *iif, 
	}



	/* check parameter: CIP Value */

	if (cmsg->CIPValue > ARRAY_SIZE(cip2bchlc) ||

	if (cmsg->CIPValue >= ARRAY_SIZE(cip2bchlc) ||

	    (cmsg->CIPValue > 0 && cip2bchlc[cmsg->CIPValue].bc == NULL)) {

		dev_notice(cs->dev, "%s: unknown CIP value %d\n",

			   "CONNECT_REQ", cmsg->CIPValue);
@@ -2191,36 +2191,24 @@ static const struct file_operations gigaset_proc_fops = { 
	.release	= single_release,

};



static struct capi_driver capi_driver_gigaset = {

	.name		= "gigaset",

	.revision	= "1.0",

};



/**

 * gigaset_isdn_register() - register to LL

 * gigaset_isdn_regdev() - register device to LL

 * @cs:		device descriptor structure.

 * @isdnid:	device name.

 *

 * Called by main module to register the device with the LL.

 *

 * Return value: 1 for success, 0 for failure

 */

int gigaset_isdn_register(struct cardstate *cs, const char *isdnid)

int gigaset_isdn_regdev(struct cardstate *cs, const char *isdnid)

{

	struct gigaset_capi_ctr *iif;

	int rc;



	pr_info("Kernel CAPI interface\n");



	iif = kmalloc(sizeof(*iif), GFP_KERNEL);

	if (!iif) {

		pr_err("%s: out of memory\n", __func__);

		return 0;

	}



	/* register driver with CAPI (ToDo: what for?) */

	register_capi_driver(&capi_driver_gigaset);



	/* prepare controller structure */

	iif->ctr.owner         = THIS_MODULE;

	iif->ctr.driverdata    = cs;
@@ -2241,7 +2229,6 @@ int gigaset_isdn_register(struct cardstate *cs, const char *isdnid) 
	rc = attach_capi_ctr(&iif->ctr);

	if (rc) {

		pr_err("attach_capi_ctr failed (%d)\n", rc);

		unregister_capi_driver(&capi_driver_gigaset);

		kfree(iif);

		return 0;

	}
@@ -2252,17 +2239,36 @@ int gigaset_isdn_register(struct cardstate *cs, const char *isdnid) 
}



/**

 * gigaset_isdn_unregister() - unregister from LL

 * gigaset_isdn_unregdev() - unregister device from LL

 * @cs:		device descriptor structure.

 *

 * Called by main module to unregister the device from the LL.

 */

void gigaset_isdn_unregister(struct cardstate *cs)

void gigaset_isdn_unregdev(struct cardstate *cs)

{

	struct gigaset_capi_ctr *iif = cs->iif;



	detach_capi_ctr(&iif->ctr);

	kfree(iif);

	cs->iif = NULL;

}



static struct capi_driver capi_driver_gigaset = {

	.name		= "gigaset",

	.revision	= "1.0",

};



/**

 * gigaset_isdn_regdrv() - register driver to LL

 */

void gigaset_isdn_regdrv(void)

{

	pr_info("Kernel CAPI interface\n");

	register_capi_driver(&capi_driver_gigaset);

}



/**

 * gigaset_isdn_unregdrv() - unregister driver from LL

 */

void gigaset_isdn_unregdrv(void)

{

	unregister_capi_driver(&capi_driver_gigaset);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE