From owner-svn-src-projects@FreeBSD.ORG Mon Jan 3 22:59:16 2011 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 058C2106564A; Mon, 3 Jan 2011 22:59:16 +0000 (UTC) (envelope-from jeff@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id DE1E08FC15; Mon, 3 Jan 2011 22:59:15 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p03MxFHE008159; Mon, 3 Jan 2011 22:59:15 GMT (envelope-from jeff@svn.freebsd.org) Received: (from jeff@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p03MxFlf008154; Mon, 3 Jan 2011 22:59:15 GMT (envelope-from jeff@svn.freebsd.org) Message-Id: <201101032259.p03MxFlf008154@svn.freebsd.org> From: Jeff Roberson Date: Mon, 3 Jan 2011 22:59:15 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r216936 - in projects/ofed/head/sys/ofed/drivers/infiniband: core ulp/ipoib X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 03 Jan 2011 22:59:16 -0000 Author: jeff Date: Mon Jan 3 22:59:15 2011 New Revision: 216936 URL: http://svn.freebsd.org/changeset/base/216936 Log: - Add link_state_change calls to ipoib. - Fix a corrupt filp pointer that can occur now that I've switched back to kmalloc from kzalloc. Sponsored by: Isilon Systems, iX Systems, and Panasas. Modified: projects/ofed/head/sys/ofed/drivers/infiniband/core/uverbs_main.c projects/ofed/head/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_ib.c projects/ofed/head/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_main.c projects/ofed/head/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_multicast.c Modified: projects/ofed/head/sys/ofed/drivers/infiniband/core/uverbs_main.c ============================================================================== --- projects/ofed/head/sys/ofed/drivers/infiniband/core/uverbs_main.c Mon Jan 3 22:58:22 2011 (r216935) +++ projects/ofed/head/sys/ofed/drivers/infiniband/core/uverbs_main.c Mon Jan 3 22:59:15 2011 (r216936) @@ -552,6 +552,7 @@ struct file *ib_uverbs_alloc_event_file( ev_file->async_queue = NULL; ev_file->is_async = is_async; ev_file->is_closed = 0; + ev_file->filp = NULL; *fd = get_unused_fd(); if (*fd < 0) { Modified: projects/ofed/head/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_ib.c ============================================================================== --- projects/ofed/head/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_ib.c Mon Jan 3 22:58:22 2011 (r216935) +++ projects/ofed/head/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_ib.c Mon Jan 3 22:59:15 2011 (r216936) @@ -660,6 +660,7 @@ int ipoib_ib_dev_down(struct ifnet *dev, ipoib_dbg(priv, "downing ib_dev\n"); clear_bit(IPOIB_FLAG_OPER_UP, &priv->flags); + if_link_state_change(dev, LINK_STATE_DOWN); /* Shutdown the P_Key thread if still active */ if (!test_bit(IPOIB_PKEY_ASSIGNED, &priv->flags)) { Modified: projects/ofed/head/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_main.c ============================================================================== --- projects/ofed/head/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_main.c Mon Jan 3 22:58:22 2011 (r216935) +++ projects/ofed/head/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_main.c Mon Jan 3 22:59:15 2011 (r216936) @@ -855,6 +855,7 @@ ipoib_intf_alloc(const char *name) sdl->sdl_type = IFT_INFINIBAND; sdl->sdl_alen = dev->if_addrlen; priv->dev = dev; + if_link_state_change(dev, LINK_STATE_DOWN); bpfattach(dev, DLT_EN10MB, IPOIB_HEADER_LEN); Modified: projects/ofed/head/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_multicast.c ============================================================================== --- projects/ofed/head/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_multicast.c Mon Jan 3 22:58:22 2011 (r216935) +++ projects/ofed/head/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_multicast.c Mon Jan 3 22:59:15 2011 (r216936) @@ -331,6 +331,7 @@ void ipoib_mcast_carrier_on_task(struct ipoib_dbg(priv, "Keeping carrier off until IB port is active\n"); return; } + if_link_state_change(priv->dev, LINK_STATE_UP); } static int ipoib_mcast_join_complete(int status,