svn commit: r287457 - head/sys/netinet

[Michael Tuexen]

Author: tuexen
Date: Fri Sep  4 09:24:07 2015
New Revision: 287457
URL: https://svnweb.freebsd.org/changeset/base/287457

Log:
  Don't leak memory in an error case.
  
  MFC after:1 week

Modified:
  head/sys/netinet/sctp_output.c

Modified: head/sys/netinet/sctp_output.c
==
--- head/sys/netinet/sctp_output.c  Fri Sep  4 09:22:16 2015
(r287456)
+++ head/sys/netinet/sctp_output.c  Fri Sep  4 09:24:07 2015
(r287457)
@@ -11235,6 +11235,11 @@ sctp_send_hb(struct sctp_tcb *stcb, stru
break;
 #endif
default:
+   if (chk->data) {
+   sctp_m_freem(chk->data);
+   chk->data = NULL;
+   }
+   sctp_free_a_chunk(stcb, chk, so_locked);
return;
break;
}
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r287458 - head/usr.sbin/ctladm

[Alexander Motin]

Author: mav
Date: Fri Sep  4 10:14:58 2015
New Revision: 287458
URL: https://svnweb.freebsd.org/changeset/base/287458

Log:
  Addition to r287455.

Modified:
  head/usr.sbin/ctladm/ctladm.c

Modified: head/usr.sbin/ctladm/ctladm.c
==
--- head/usr.sbin/ctladm/ctladm.c   Fri Sep  4 09:24:07 2015
(r287457)
+++ head/usr.sbin/ctladm/ctladm.c   Fri Sep  4 10:14:58 2015
(r287458)
@@ -68,7 +68,6 @@ __FBSDID("$FreeBSD$");
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r287460 - head/sys/netinet

[Gleb Smirnoff]

Author: glebius
Date: Fri Sep  4 12:02:12 2015
New Revision: 287460
URL: https://svnweb.freebsd.org/changeset/base/287460

Log:
  Make tcp_mtudisc() static and void. No functional changes.
  
  Sponsored by: Nginx, Inc.

Modified:
  head/sys/netinet/tcp_subr.c
  head/sys/netinet/tcp_var.h

Modified: head/sys/netinet/tcp_subr.c
==
--- head/sys/netinet/tcp_subr.c Fri Sep  4 10:16:21 2015(r287459)
+++ head/sys/netinet/tcp_subr.c Fri Sep  4 12:02:12 2015(r287460)
@@ -228,6 +228,7 @@ VNET_DEFINE(struct hhook_head *, tcp_hhh
 
 static struct inpcb *tcp_notify(struct inpcb *, int);
 static struct inpcb *tcp_mtudisc_notify(struct inpcb *, int);
+static void tcp_mtudisc(struct inpcb *, int);
 static char *  tcp_log_addr(struct in_conninfo *inc, struct tcphdr *th,
void *ip4hdr, const void *ip6hdr);
 static voidtcp_timer_discard(struct tcpcb *, uint32_t);
@@ -1811,10 +1812,11 @@ static struct inpcb *
 tcp_mtudisc_notify(struct inpcb *inp, int error)
 {
 
-   return (tcp_mtudisc(inp, -1));
+   tcp_mtudisc(inp, -1);
+   return (inp);
 }
 
-struct inpcb *
+static void
 tcp_mtudisc(struct inpcb *inp, int mtuoffer)
 {
struct tcpcb *tp;
@@ -1823,7 +1825,7 @@ tcp_mtudisc(struct inpcb *inp, int mtuof
INP_WLOCK_ASSERT(inp);
if ((inp->inp_flags & INP_TIMEWAIT) ||
(inp->inp_flags & INP_DROPPED))
-   return (inp);
+   return;
 
tp = intotcpcb(inp);
KASSERT(tp != NULL, ("tcp_mtudisc: tp == NULL"));
@@ -1845,7 +1847,6 @@ tcp_mtudisc(struct inpcb *inp, int mtuof
if (tp->t_flags & TF_SACK_PERMIT)
EXIT_FASTRECOVERY(tp->t_flags);
tcp_output(tp);
-   return (inp);
 }
 
 #ifdef INET

Modified: head/sys/netinet/tcp_var.h
==
--- head/sys/netinet/tcp_var.h  Fri Sep  4 10:16:21 2015(r287459)
+++ head/sys/netinet/tcp_var.h  Fri Sep  4 12:02:12 2015(r287460)
@@ -687,8 +687,6 @@ void tcp_mss(struct tcpcb *, int);
 int tcp_mssopt(struct in_conninfo *);
 struct inpcb *
 tcp_drop_syn_sent(struct inpcb *, int);
-struct inpcb *
-tcp_mtudisc(struct inpcb *, int);
 struct tcpcb *
 tcp_newtcpcb(struct inpcb *);
 int tcp_output(struct tcpcb *);
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r287456 - head/sys/netinet

[Michael Tuexen]

Author: tuexen
Date: Fri Sep  4 09:22:16 2015
New Revision: 287456
URL: https://svnweb.freebsd.org/changeset/base/287456

Log:
  Add a NULL pointer check to silence the clang code analyzer.
  
  MFC after:1 week

Modified:
  head/sys/netinet/sctputil.c

Modified: head/sys/netinet/sctputil.c
==
--- head/sys/netinet/sctputil.c Fri Sep  4 09:19:01 2015(r287455)
+++ head/sys/netinet/sctputil.c Fri Sep  4 09:22:16 2015(r287456)
@@ -2667,6 +2667,9 @@ sctp_notify_assoc_change(uint16_t state,
 
 #endif
 
+   if (stcb == NULL) {
+   return;
+   }
if (sctp_stcb_is_feature_on(stcb->sctp_ep, stcb, 
SCTP_PCB_FLAGS_RECVASSOCEVNT)) {
notif_len = sizeof(struct sctp_assoc_change);
if (abort != NULL) {
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r287459 - head/usr.sbin/ctld

[Alexander Motin]

Author: mav
Date: Fri Sep  4 10:16:21 2015
New Revision: 287459
URL: https://svnweb.freebsd.org/changeset/base/287459

Log:
  Another addition to r287455.

Modified:
  head/usr.sbin/ctld/kernel.c

Modified: head/usr.sbin/ctld/kernel.c
==
--- head/usr.sbin/ctld/kernel.c Fri Sep  4 10:14:58 2015(r287458)
+++ head/usr.sbin/ctld/kernel.c Fri Sep  4 10:16:21 2015(r287459)
@@ -62,7 +62,6 @@ __FBSDID("$FreeBSD$");
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r287455 - head/sys/cam/ctl

[Alexander Motin]

Author: mav
Date: Fri Sep  4 09:19:01 2015
New Revision: 287455
URL: https://svnweb.freebsd.org/changeset/base/287455

Log:
  Remove some dead code.

Deleted:
  head/sys/cam/ctl/ctl_backend_block.h
Modified:
  head/sys/cam/ctl/README.ctl.txt
  head/sys/cam/ctl/ctl_backend_block.c

Modified: head/sys/cam/ctl/README.ctl.txt
==
--- head/sys/cam/ctl/README.ctl.txt Fri Sep  4 08:04:12 2015
(r287454)
+++ head/sys/cam/ctl/README.ctl.txt Fri Sep  4 09:19:01 2015
(r287455)
@@ -318,7 +318,6 @@ These files define the basic CTL backend
 explain the API.
 
 ctl_backend_block.c
-ctl_backend_block.h:
 ---
 
 The block and file backend.  This allows for using a disk or a file as the

Modified: head/sys/cam/ctl/ctl_backend_block.c
==
--- head/sys/cam/ctl/ctl_backend_block.cFri Sep  4 08:04:12 2015
(r287454)
+++ head/sys/cam/ctl/ctl_backend_block.cFri Sep  4 09:19:01 2015
(r287455)
@@ -154,7 +154,6 @@ typedef uint64_t (*cbb_getattr_t)(struct
  */
 struct ctl_be_block_lun {
struct ctl_lun_create_params params;
-   struct ctl_block_disk *disk;
char lunname[32];
char *dev_path;
ctl_be_block_type dev_type;
@@ -196,8 +195,6 @@ struct ctl_be_block_lun {
  */
 struct ctl_be_block_softc {
struct mtx   lock;
-   int  num_disks;
-   STAILQ_HEAD(, ctl_block_disk)disk_list;
int  num_luns;
STAILQ_HEAD(, ctl_be_block_lun)  lun_list;
 };
@@ -2906,7 +2903,6 @@ ctl_be_block_init(void)
mtx_init(>lock, "ctlblock", NULL, MTX_DEF);
beio_zone = uma_zcreate("beio", sizeof(struct ctl_be_block_io),
NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, 0);
-   STAILQ_INIT(>disk_list);
STAILQ_INIT(>lun_list);
 
return (retval);
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r287465 - head/sys/dev/e1000

[Sean Bruno]

Author: sbruno
Date: Fri Sep  4 16:07:27 2015
New Revision: 287465
URL: https://svnweb.freebsd.org/changeset/base/287465

Log:
  igb(4): Update and fix HW errata
  - HW errata workaround for IPv6 offload w/ extension headers
  - Edited start of if_igb.c (Device IDs / #includes) to match ixgbe/ixl
  
  Differential Revision:https://reviews.freebsd.org/D3165
  Submitted by: erj
  MFC after:1 month
  Sponsored by: Intel Corporation

Modified:
  head/sys/dev/e1000/if_igb.c
  head/sys/dev/e1000/if_igb.h

Modified: head/sys/dev/e1000/if_igb.c
==
--- head/sys/dev/e1000/if_igb.c Fri Sep  4 15:49:51 2015(r287464)
+++ head/sys/dev/e1000/if_igb.c Fri Sep  4 16:07:27 2015(r287465)
@@ -42,71 +42,12 @@
 #include "opt_altq.h"
 #endif
 
-#include 
-#include 
-#ifndef IGB_LEGACY_TX
-#include 
-#endif
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#ifdef RSS
-#include 
-#endif
-
-#include 
-#include 
-
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-
-#include 
-#include 
-#include 
-#include 
-
-#include "e1000_api.h"
-#include "e1000_82575.h"
 #include "if_igb.h"
 
 /*
- *  Set this to one to display debug statistics
- */
-intigb_display_debug_stats = 0;
-
-/*
  *  Driver version:
  */
-char igb_driver_version[] = "version - 2.4.0";
+char igb_driver_version[] = "2.5.2";
 
 
 /*
@@ -121,60 +62,47 @@ char igb_driver_version[] = "version - 2
 
 static igb_vendor_info_t igb_vendor_info_array[] =
 {
-   { 0x8086, E1000_DEV_ID_82575EB_COPPER,  PCI_ANY_ID, PCI_ANY_ID, 0},
-   { 0x8086, E1000_DEV_ID_82575EB_FIBER_SERDES,
-   PCI_ANY_ID, PCI_ANY_ID, 0},
-   { 0x8086, E1000_DEV_ID_82575GB_QUAD_COPPER,
-   PCI_ANY_ID, PCI_ANY_ID, 0},
-   { 0x8086, E1000_DEV_ID_82576,   PCI_ANY_ID, PCI_ANY_ID, 0},
-   { 0x8086, E1000_DEV_ID_82576_NS,PCI_ANY_ID, PCI_ANY_ID, 0},
-   { 0x8086, E1000_DEV_ID_82576_NS_SERDES, PCI_ANY_ID, PCI_ANY_ID, 0},
-   { 0x8086, E1000_DEV_ID_82576_FIBER, PCI_ANY_ID, PCI_ANY_ID, 0},
-   { 0x8086, E1000_DEV_ID_82576_SERDES,PCI_ANY_ID, PCI_ANY_ID, 0},
-   { 0x8086, E1000_DEV_ID_82576_SERDES_QUAD,
-   PCI_ANY_ID, PCI_ANY_ID, 0},
-   { 0x8086, E1000_DEV_ID_82576_QUAD_COPPER,
-   PCI_ANY_ID, PCI_ANY_ID, 0},
-   { 0x8086, E1000_DEV_ID_82576_QUAD_COPPER_ET2,
-   PCI_ANY_ID, PCI_ANY_ID, 0},
-   { 0x8086, E1000_DEV_ID_82576_VF,PCI_ANY_ID, PCI_ANY_ID, 0},
-   { 0x8086, E1000_DEV_ID_82580_COPPER,PCI_ANY_ID, PCI_ANY_ID, 0},
-   { 0x8086, E1000_DEV_ID_82580_FIBER, PCI_ANY_ID, PCI_ANY_ID, 0},
-   { 0x8086, E1000_DEV_ID_82580_SERDES,PCI_ANY_ID, PCI_ANY_ID, 0},
-   { 0x8086, E1000_DEV_ID_82580_SGMII, PCI_ANY_ID, PCI_ANY_ID, 0},
-   { 0x8086, E1000_DEV_ID_82580_COPPER_DUAL,
-   PCI_ANY_ID, PCI_ANY_ID, 0},
-   { 0x8086, E1000_DEV_ID_82580_QUAD_FIBER,
-   PCI_ANY_ID, PCI_ANY_ID, 0},
-   { 0x8086, E1000_DEV_ID_DH89XXCC_SERDES, PCI_ANY_ID, PCI_ANY_ID, 0},
-   { 0x8086, E1000_DEV_ID_DH89XXCC_SGMII,  PCI_ANY_ID, PCI_ANY_ID, 0},
-   { 0x8086, E1000_DEV_ID_DH89XXCC_SFP,PCI_ANY_ID, PCI_ANY_ID, 0},
-   { 0x8086, E1000_DEV_ID_DH89XXCC_BACKPLANE,
-   PCI_ANY_ID, PCI_ANY_ID, 0},
-   { 0x8086, E1000_DEV_ID_I350_COPPER, PCI_ANY_ID, PCI_ANY_ID, 0},
-   { 0x8086, E1000_DEV_ID_I350_FIBER,  PCI_ANY_ID, PCI_ANY_ID, 0},
-   { 0x8086, E1000_DEV_ID_I350_SERDES, PCI_ANY_ID, PCI_ANY_ID, 0},
-   { 0x8086, E1000_DEV_ID_I350_SGMII,  PCI_ANY_ID, PCI_ANY_ID, 0},
-   { 0x8086, E1000_DEV_ID_I350_VF, PCI_ANY_ID, PCI_ANY_ID, 0},
-   { 0x8086, E1000_DEV_ID_I210_COPPER, PCI_ANY_ID, PCI_ANY_ID, 0},
-   { 0x8086, E1000_DEV_ID_I210_COPPER_IT,  PCI_ANY_ID, PCI_ANY_ID, 0},
-   { 0x8086, E1000_DEV_ID_I210_COPPER_OEM1,
-   PCI_ANY_ID, PCI_ANY_ID, 0},
-   { 0x8086, E1000_DEV_ID_I210_COPPER_FLASHLESS,
-   PCI_ANY_ID, PCI_ANY_ID, 0},
-   

svn commit: r287467 - head/sys/dev/e1000

[Sean Bruno]

Author: sbruno
Date: Fri Sep  4 16:30:48 2015
New Revision: 287467
URL: https://svnweb.freebsd.org/changeset/base/287467

Log:
  e1000: Shared code updates
  -Fix compiler warning in 80003es2lan.c
  -Add return value handler for e1000_*_kmrn_reg_80003es2lan
  -Fix usage of DEBUGOUT
  -Remove unnecessary variable initializations.
  -Removed unused variables (complaints from gcc).
  -Edit defines in 82571.h.
  -Add workaround for igb hw errata.
  -Shared code changes for Skylake/I219 support.
  -Remove unused OBFF and LTR functions.
  
  Differential Revision:https://reviews.freebsd.org/D3162
  Submitted by: erj
  MFC after:1 month
  Sponsored by: Intel Corporation

Modified:
  head/sys/dev/e1000/e1000_80003es2lan.c
  head/sys/dev/e1000/e1000_82540.c
  head/sys/dev/e1000/e1000_82541.c
  head/sys/dev/e1000/e1000_82542.c
  head/sys/dev/e1000/e1000_82543.c
  head/sys/dev/e1000/e1000_82571.h
  head/sys/dev/e1000/e1000_82575.c
  head/sys/dev/e1000/e1000_82575.h
  head/sys/dev/e1000/e1000_api.c
  head/sys/dev/e1000/e1000_api.h
  head/sys/dev/e1000/e1000_defines.h
  head/sys/dev/e1000/e1000_hw.h
  head/sys/dev/e1000/e1000_i210.c
  head/sys/dev/e1000/e1000_i210.h
  head/sys/dev/e1000/e1000_ich8lan.c
  head/sys/dev/e1000/e1000_ich8lan.h
  head/sys/dev/e1000/e1000_mac.c
  head/sys/dev/e1000/e1000_mac.h
  head/sys/dev/e1000/e1000_nvm.c
  head/sys/dev/e1000/e1000_nvm.h
  head/sys/dev/e1000/e1000_osdep.h
  head/sys/dev/e1000/e1000_phy.c
  head/sys/dev/e1000/e1000_regs.h
  head/sys/dev/e1000/if_igb.c

Modified: head/sys/dev/e1000/e1000_80003es2lan.c
==
--- head/sys/dev/e1000/e1000_80003es2lan.c  Fri Sep  4 16:13:25 2015
(r287466)
+++ head/sys/dev/e1000/e1000_80003es2lan.c  Fri Sep  4 16:30:48 2015
(r287467)
@@ -851,11 +851,17 @@ static s32 e1000_reset_hw_80003es2lan(st
e1000_release_phy_80003es2lan(hw);
 
/* Disable IBIST slave mode (far-end loopback) */
-   e1000_read_kmrn_reg_80003es2lan(hw, E1000_KMRNCTRLSTA_INBAND_PARAM,
-   _reg_data);
-   kum_reg_data |= E1000_KMRNCTRLSTA_IBIST_DISABLE;
-   e1000_write_kmrn_reg_80003es2lan(hw, E1000_KMRNCTRLSTA_INBAND_PARAM,
-   kum_reg_data);
+   ret_val = e1000_read_kmrn_reg_80003es2lan(hw,
+   E1000_KMRNCTRLSTA_INBAND_PARAM, _reg_data);
+   if (!ret_val) {
+   kum_reg_data |= E1000_KMRNCTRLSTA_IBIST_DISABLE;
+   ret_val = e1000_write_kmrn_reg_80003es2lan(hw,
+E1000_KMRNCTRLSTA_INBAND_PARAM,
+kum_reg_data);
+   if (ret_val)
+   DEBUGOUT("Error disabling far-end loopback\n");
+   } else
+   DEBUGOUT("Error disabling far-end loopback\n");
 
ret_val = e1000_get_auto_rd_done_generic(hw);
if (ret_val)
@@ -911,11 +917,18 @@ static s32 e1000_init_hw_80003es2lan(str
return ret_val;
 
/* Disable IBIST slave mode (far-end loopback) */
-   e1000_read_kmrn_reg_80003es2lan(hw, E1000_KMRNCTRLSTA_INBAND_PARAM,
-   _reg_data);
-   kum_reg_data |= E1000_KMRNCTRLSTA_IBIST_DISABLE;
-   e1000_write_kmrn_reg_80003es2lan(hw, E1000_KMRNCTRLSTA_INBAND_PARAM,
-kum_reg_data);
+   ret_val =
+   e1000_read_kmrn_reg_80003es2lan(hw, E1000_KMRNCTRLSTA_INBAND_PARAM,
+   _reg_data);
+   if (!ret_val) {
+   kum_reg_data |= E1000_KMRNCTRLSTA_IBIST_DISABLE;
+   ret_val = e1000_write_kmrn_reg_80003es2lan(hw,
+E1000_KMRNCTRLSTA_INBAND_PARAM,
+kum_reg_data);
+   if (ret_val)
+   DEBUGOUT("Error disabling far-end loopback\n");
+   } else
+   DEBUGOUT("Error disabling far-end loopback\n");
 
/* Set the transmit descriptor write-back policy */
reg_data = E1000_READ_REG(hw, E1000_TXDCTL(0));

Modified: head/sys/dev/e1000/e1000_82540.c
==
--- head/sys/dev/e1000/e1000_82540.cFri Sep  4 16:13:25 2015
(r287466)
+++ head/sys/dev/e1000/e1000_82540.cFri Sep  4 16:30:48 2015
(r287467)
@@ -66,7 +66,7 @@ static s32  e1000_read_mac_addr_82540(st
 static s32 e1000_init_phy_params_82540(struct e1000_hw *hw)
 {
struct e1000_phy_info *phy = >phy;
-   s32 ret_val = E1000_SUCCESS;
+   s32 ret_val;
 
phy->addr   = 1;
phy->autoneg_mask   = AUTONEG_ADVERTISE_SPEED_DEFAULT;
@@ -329,7 +329,7 @@ static s32 e1000_init_hw_82540(struct e1
 {
struct e1000_mac_info *mac = >mac;
u32 

svn commit: r287468 - head/usr.sbin/ntp

[Cy Schubert]

Author: cy
Date: Fri Sep  4 16:59:01 2015
New Revision: 287468
URL: https://svnweb.freebsd.org/changeset/base/287468

Log:
  Turn on RAWDCF by default.
  
  Suggested by: ian
  Approved by:  roberto
  MFC after:1 week

Modified:
  head/usr.sbin/ntp/config.h

Modified: head/usr.sbin/ntp/config.h
==
--- head/usr.sbin/ntp/config.h  Fri Sep  4 16:30:48 2015(r287467)
+++ head/usr.sbin/ntp/config.h  Fri Sep  4 16:59:01 2015(r287468)
@@ -120,7 +120,7 @@
 #define CLOCK_PST 1
 
 /* DCF77 raw time code */
-/* #undef CLOCK_RAWDCF */
+#define CLOCK_RAWDCF 1
 
 /* RCC 8000 clock */
 /* #undef CLOCK_RCC8000 */
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r287466 - in head/secure: libexec/sftp-server libexec/ssh-keysign libexec/ssh-pkcs11-helper usr.bin/scp usr.bin/sftp usr.bin/ssh-add usr.bin/ssh-agent usr.bin/ssh-keyscan usr.sbin/sshd

[Baptiste Daroussin]

Author: bapt
Date: Fri Sep  4 16:13:25 2015
New Revision: 287466
URL: https://svnweb.freebsd.org/changeset/base/287466

Log:
  Remove remnant from USEPRIVATELIB removal
  
  Sponsored by: gandi.net

Modified:
  head/secure/libexec/sftp-server/Makefile
  head/secure/libexec/ssh-keysign/Makefile
  head/secure/libexec/ssh-pkcs11-helper/Makefile
  head/secure/usr.bin/scp/Makefile
  head/secure/usr.bin/sftp/Makefile
  head/secure/usr.bin/ssh-add/Makefile
  head/secure/usr.bin/ssh-agent/Makefile
  head/secure/usr.bin/ssh-keyscan/Makefile
  head/secure/usr.sbin/sshd/Makefile

Modified: head/secure/libexec/sftp-server/Makefile
==
--- head/secure/libexec/sftp-server/MakefileFri Sep  4 16:07:27 2015
(r287465)
+++ head/secure/libexec/sftp-server/MakefileFri Sep  4 16:13:25 2015
(r287466)
@@ -18,7 +18,6 @@ LIBADD=   ssh
 CFLAGS+=   -DHAVE_LDNS=1
 #DPADD+=   ${LIBLDNS}
 #LDADD+=   -lldns
-#USEPRIVATELIB+= ldns
 .endif
 
 .include 

Modified: head/secure/libexec/ssh-keysign/Makefile
==
--- head/secure/libexec/ssh-keysign/MakefileFri Sep  4 16:07:27 2015
(r287465)
+++ head/secure/libexec/ssh-keysign/MakefileFri Sep  4 16:13:25 2015
(r287466)
@@ -14,7 +14,6 @@ LIBADD=   ssh
 CFLAGS+=   -DHAVE_LDNS=1
 #DPADD+=   ${LIBLDNS}
 #LDADD+=   -lldns
-#USEPRIVATELIB+= ldns
 .endif
 
 LIBADD+=   crypto

Modified: head/secure/libexec/ssh-pkcs11-helper/Makefile
==
--- head/secure/libexec/ssh-pkcs11-helper/Makefile  Fri Sep  4 16:07:27 
2015(r287465)
+++ head/secure/libexec/ssh-pkcs11-helper/Makefile  Fri Sep  4 16:13:25 
2015(r287466)
@@ -18,7 +18,6 @@ LIBADD=   ssh
 CFLAGS+=   -DHAVE_LDNS=1
 #DPADD+=   ${LIBLDNS}
 #LDADD+=   -lldns
-#USEPRIVATELIB+= ldns
 .endif
 
 LIBADD+=   crypto

Modified: head/secure/usr.bin/scp/Makefile
==
--- head/secure/usr.bin/scp/MakefileFri Sep  4 16:07:27 2015
(r287465)
+++ head/secure/usr.bin/scp/MakefileFri Sep  4 16:13:25 2015
(r287466)
@@ -17,7 +17,6 @@ LIBADD=   ssh
 CFLAGS+=   -DHAVE_LDNS=1
 #DPADD+=   ${LIBLDNS}
 #LDADD+=   -lldns
-#USEPRIVATELIB+= ldns
 .endif
 
 .include 

Modified: head/secure/usr.bin/sftp/Makefile
==
--- head/secure/usr.bin/sftp/Makefile   Fri Sep  4 16:07:27 2015
(r287465)
+++ head/secure/usr.bin/sftp/Makefile   Fri Sep  4 16:13:25 2015
(r287466)
@@ -17,7 +17,6 @@ LIBADD=   ssh edit
 CFLAGS+=   -DHAVE_LDNS=1
 #DPADD+=   ${LIBLDNS}
 #LDADD+=   -lldns
-#USEPRIVATELIB+= ldns
 .endif
 
 .include 

Modified: head/secure/usr.bin/ssh-add/Makefile
==
--- head/secure/usr.bin/ssh-add/MakefileFri Sep  4 16:07:27 2015
(r287465)
+++ head/secure/usr.bin/ssh-add/MakefileFri Sep  4 16:13:25 2015
(r287466)
@@ -17,7 +17,6 @@ LIBADD=   ssh
 CFLAGS+=   -DHAVE_LDNS=1
 #DPADD+=   ${LIBLDNS}
 #LDADD+=   -lldns
-#USEPRIVATELIB+= ldns
 .endif
 
 .include 

Modified: head/secure/usr.bin/ssh-agent/Makefile
==
--- head/secure/usr.bin/ssh-agent/Makefile  Fri Sep  4 16:07:27 2015
(r287465)
+++ head/secure/usr.bin/ssh-agent/Makefile  Fri Sep  4 16:13:25 2015
(r287466)
@@ -17,7 +17,6 @@ LIBADD=   ssh
 CFLAGS+=   -DHAVE_LDNS=1
 #DPADD+=   ${LIBLDNS}
 #LDADD+=   -lldns
-#USEPRIVATELIB+= ldns
 .endif
 
 LIBADD+=   crypto

Modified: head/secure/usr.bin/ssh-keyscan/Makefile
==
--- head/secure/usr.bin/ssh-keyscan/MakefileFri Sep  4 16:07:27 2015
(r287465)
+++ head/secure/usr.bin/ssh-keyscan/MakefileFri Sep  4 16:13:25 2015
(r287466)
@@ -12,7 +12,6 @@ LIBADD=   ssh
 CFLAGS+=   -DHAVE_LDNS=1
 #DPADD+=   ${LIBLDNS}
 #LDADD+=   -lldns
-#USEPRIVATELIB+= ldns
 .endif
 
 .include 

Modified: head/secure/usr.sbin/sshd/Makefile
==
--- head/secure/usr.sbin/sshd/Makefile  Fri Sep  4 16:07:27 2015
(r287465)
+++ head/secure/usr.sbin/sshd/Makefile  Fri Sep  4 16:13:25 2015
(r287466)
@@ -32,7 +32,6 @@ LIBADD=   pam ssh util wrap
 CFLAGS+=   -DHAVE_LDNS=1
 #DPADD+=   ${LIBLDNS}
 #LDADD+=   -lldns
-#USEPRIVATELIB+= ldns
 .endif
 
 .if ${MK_AUDIT} != "no"
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To 

Re: svn commit: r287465 - head/sys/dev/e1000

[hiren panchasara]

+ erj

On 09/04/15 at 04:07P, Sean Bruno wrote:
> Author: sbruno
> Date: Fri Sep  4 16:07:27 2015
> New Revision: 287465
> URL: https://svnweb.freebsd.org/changeset/base/287465
> 
> Log:
>   igb(4): Update and fix HW errata
>   - HW errata workaround for IPv6 offload w/ extension headers
It would be useful to know what is the actual problem here.

>   - Edited start of if_igb.c (Device IDs / #includes) to match ixgbe/ixl
I'd also prefer if such changes come via separate commits. :-)

>   
>   Differential Revision:  https://reviews.freebsd.org/D3165
>   Submitted by:   erj
>   MFC after:  1 month
>   Sponsored by:   Intel Corporation
> 
> Modified:
>   head/sys/dev/e1000/if_igb.c
>   head/sys/dev/e1000/if_igb.h

[skip]

Cheers,
Hiren


pgp0hNkO8FImv.pgp
Description: PGP signature

svn commit: r287470 - head/sys/dev/mii

[Sean Bruno]

Author: sbruno
Date: Fri Sep  4 17:48:19 2015
New Revision: 287470
URL: https://svnweb.freebsd.org/changeset/base/287470

Log:
  Add more BCM gigabit PHYs
  
  Gleaned from a public header file. 5402 and 5404 look like they may be
  used on embedded devices. 5478 and 5488 are switch PHYs. 5754 change is just
  to note a product alias.
  
  Differential Revision:https://reviews.freebsd.org/D3338
  Submitted by: kevin.bowl...@kev009.com

Modified:
  head/sys/dev/mii/brgphy.c
  head/sys/dev/mii/miidevs

Modified: head/sys/dev/mii/brgphy.c
==
--- head/sys/dev/mii/brgphy.c   Fri Sep  4 17:21:55 2015(r287469)
+++ head/sys/dev/mii/brgphy.c   Fri Sep  4 17:48:19 2015(r287470)
@@ -118,7 +118,10 @@ static voidbrgphy_jumbo_settings(struct
 static const struct mii_phydesc brgphys[] = {
MII_PHY_DESC(BROADCOM, BCM5400),
MII_PHY_DESC(BROADCOM, BCM5401),
+   MII_PHY_DESC(BROADCOM, BCM5402),
MII_PHY_DESC(BROADCOM, BCM5411),
+   MII_PHY_DESC(BROADCOM, BCM5404),
+   MII_PHY_DESC(BROADCOM, BCM5424),
MII_PHY_DESC(BROADCOM, BCM54K2),
MII_PHY_DESC(BROADCOM, BCM5701),
MII_PHY_DESC(BROADCOM, BCM5703),
@@ -132,6 +135,8 @@ static const struct mii_phydesc brgphys[
MII_PHY_DESC(BROADCOM, BCM5780),
MII_PHY_DESC(BROADCOM, BCM5708C),
MII_PHY_DESC(BROADCOM, BCM5466),
+   MII_PHY_DESC(BROADCOM2, BCM5478),
+   MII_PHY_DESC(BROADCOM2, BCM5488),
MII_PHY_DESC(BROADCOM2, BCM5482),
MII_PHY_DESC(BROADCOM2, BCM5708S),
MII_PHY_DESC(BROADCOM2, BCM5709C),

Modified: head/sys/dev/mii/miidevs
==
--- head/sys/dev/mii/miidevsFri Sep  4 17:21:55 2015(r287469)
+++ head/sys/dev/mii/miidevsFri Sep  4 17:48:19 2015(r287470)
@@ -154,7 +154,10 @@ model xxBROADCOM BCM4401   0x0036 BCM4401 
 model xxBROADCOM BCM5365   0x0037 BCM5365 10/100 5-port PHY switch
 model BROADCOM BCM5400 0x0004 BCM5400 1000BASE-T media interface
 model BROADCOM BCM5401 0x0005 BCM5401 1000BASE-T media interface
+model BROADCOM BCM5402 0x0006 BCM5402 1000BASE-T media interface
 model BROADCOM BCM5411 0x0007 BCM5411 1000BASE-T media interface
+model BROADCOM BCM5404 0x0008 BCM5404 1000BASE-T media interface
+model BROADCOM BCM5424 0x000a BCM5424/BCM5234 1000BASE-T media 
interface
 model BROADCOM BCM5464 0x000b BCM5464 1000BASE-T media interface
 model BROADCOM BCM5461 0x000c BCM5461 1000BASE-T media interface
 model BROADCOM BCM5462 0x000d BCM5462 1000BASE-T media interface
@@ -173,10 +176,12 @@ model BROADCOM BCM5708C   0x0036 BCM5708C
 model BROADCOM BCM5466 0x003b BCM5466 1000BASE-T media interface
 model BROADCOM2 BCM53250x0003 BCM5325 10/100 5-port PHY switch
 model BROADCOM2 BCM59060x0004 BCM5906 10/100baseTX media 
interface
+model BROADCOM2 BCM54780x0008 BCM5478 1000BASE-T media 
interface
+model BROADCOM2 BCM54880x0009 BCM5488 1000BASE-T media 
interface
 model BROADCOM2 BCM54810x000a BCM5481 1000BASE-T media 
interface
 model BROADCOM2 BCM54820x000b BCM5482 1000BASE-T media 
interface
 model BROADCOM2 BCM57550x000c BCM5755 1000BASE-T media 
interface
-model BROADCOM2 BCM57540x000e BCM5754/5787 1000BASE-T media 
interface
+model BROADCOM2 BCM57540x000e BCM5754/BCM5787 1000BASE-T media 
interface
 model BROADCOM2 BCM5708S   0x0015 BCM5708S 1000/2500baseSX PHY
 model BROADCOM2 BCM57850x0016 BCM5785 1000BASE-T media 
interface
 model BROADCOM2 BCM5709CAX 0x002c BCM5709CAX 10/100/1000baseT PHY
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r287469 - head/sys/dev/e1000

[Sean Bruno]

Author: sbruno
Date: Fri Sep  4 17:21:55 2015
New Revision: 287469
URL: https://svnweb.freebsd.org/changeset/base/287469

Log:
  em(4): Add Skylake/I219 support.
  - driver rev 7.5.2
  - use new functions em_flush* for i219 devices
  
  Differential Revision:https://reviews.freebsd.org/D3163
  Submitted by: erj jfv
  Reviewed by:  jfv
  MFC after:1 month
  Relnotes: Yes
  Sponsored by: Intel Corporation

Modified:
  head/sys/dev/e1000/if_em.c
  head/sys/dev/e1000/if_em.h

Modified: head/sys/dev/e1000/if_em.c
==
--- head/sys/dev/e1000/if_em.c  Fri Sep  4 16:59:01 2015(r287468)
+++ head/sys/dev/e1000/if_em.c  Fri Sep  4 17:21:55 2015(r287469)
@@ -103,7 +103,7 @@ int em_display_debug_stats = 0;
 /*
  *  Driver version:
  */
-char em_driver_version[] = "7.4.2";
+char em_driver_version[] = "7.5.2";
 
 /*
  *  PCI Device ID Table
@@ -191,6 +191,11 @@ static em_vendor_info_t em_vendor_info_a
{ 0x8086, E1000_DEV_ID_PCH_I218_V2, PCI_ANY_ID, PCI_ANY_ID, 0},
{ 0x8086, E1000_DEV_ID_PCH_I218_LM3,PCI_ANY_ID, PCI_ANY_ID, 0},
{ 0x8086, E1000_DEV_ID_PCH_I218_V3, PCI_ANY_ID, PCI_ANY_ID, 0},
+   { 0x8086, E1000_DEV_ID_PCH_SPT_I219_LM, PCI_ANY_ID, PCI_ANY_ID, 0},
+   { 0x8086, E1000_DEV_ID_PCH_SPT_I219_V,  PCI_ANY_ID, PCI_ANY_ID, 0},
+   { 0x8086, E1000_DEV_ID_PCH_SPT_I219_LM2,
+PCI_ANY_ID, PCI_ANY_ID, 0},
+   { 0x8086, E1000_DEV_ID_PCH_SPT_I219_V2, PCI_ANY_ID, PCI_ANY_ID, 0},
/* required last entry */
{ 0, 0, 0, 0, 0}
 };
@@ -238,6 +243,7 @@ static void em_free_pci_resources(struct
 static voidem_local_timer(void *);
 static voidem_reset(struct adapter *);
 static int em_setup_interface(device_t, struct adapter *);
+static voidem_flush_desc_rings(struct adapter *);
 
 static voidem_setup_transmit_structures(struct adapter *);
 static voidem_initialize_transmit_unit(struct adapter *);
@@ -584,6 +590,20 @@ em_attach(device_t dev)
}
 
/*
+   ** In the new SPT device flash is not  a
+   ** separate BAR, rather it is also in BAR0,
+   ** so use the same tag and handle for the
+   ** FLASH read/write macros in the shared
+   ** code.
+   */
+   if (hw->mac.type == e1000_pch_spt) {
+   adapter->osdep.flash_bus_space_tag =
+   adapter->osdep.mem_bus_space_tag;
+   adapter->osdep.flash_bus_space_handle =
+   adapter->osdep.mem_bus_space_handle;
+   }
+
+   /*
 * Setup MSI/X or MSI if PCI Express
 */
adapter->msix = em_setup_msix(adapter);
@@ -1168,6 +1188,7 @@ em_ioctl(if_t ifp, u_long command, caddr
case e1000_ich10lan:
case e1000_pch2lan:
case e1000_pch_lpt:
+   case e1000_pch_spt:
case e1000_82574:
case e1000_82583:
case e1000_80003es2lan: /* 9K Jumbo Frame size */
@@ -1369,8 +1390,15 @@ em_init_locked(struct adapter *adapter)
if_clearhwassist(ifp);
if (if_getcapenable(ifp) & IFCAP_TXCSUM)
if_sethwassistbits(ifp, CSUM_TCP | CSUM_UDP, 0);
-   if (if_getcapenable(ifp) & IFCAP_TSO4)
-   if_sethwassistbits(ifp, CSUM_TSO, 0);
+   /* 
+   ** There have proven to be problems with TSO when not
+   ** at full gigabit speed, so disable the assist automatically
+   ** when at lower speeds.  -jfv
+   */
+   if (if_getcapenable(ifp) & IFCAP_TSO4) {
+   if (adapter->link_speed == SPEED_1000)
+   if_sethwassistbits(ifp, CSUM_TSO, 0);
+   }
 
/* Configure for OS presence */
em_init_manageability(adapter);
@@ -2350,6 +2378,8 @@ em_update_link_status(struct adapter *ad
switch (hw->phy.media_type) {
case e1000_media_type_copper:
if (hw->mac.get_link_status) {
+   if (hw->mac.type == e1000_pch_spt)
+   msec_delay(50);
/* Do the work to read phy */
e1000_check_for_link(hw);
link_check = !hw->mac.get_link_status;
@@ -2441,6 +2471,10 @@ em_stop(void *arg)
EM_TX_UNLOCK(txr);
}
 
+   /* I219 needs some special flushing to avoid hangs */
+   if (adapter->hw.mac.type == e1000_pch_spt)
+   em_flush_desc_rings(adapter);
+
e1000_reset_hw(>hw);
E1000_WRITE_REG(>hw, E1000_WUC, 0);
 
@@ -2860,6 +2894,116 @@ msi:
 }
 
 
+/*
+** The 3 following flush routines are used as a workaround in the
+** I219 client parts and only for them.
+**
+** em_flush_tx_ring 

svn commit: r287472 - head/share/misc

[Mark Felder]

Author: feld (ports committer)
Date: Fri Sep  4 20:15:20 2015
New Revision: 287472
URL: https://svnweb.freebsd.org/changeset/base/287472

Log:
  Update ports-secteam roster
  
  Approved by:  delphij

Modified:
  head/share/misc/organization.dot

Modified: head/share/misc/organization.dot
==
--- head/share/misc/organization.dotFri Sep  4 19:57:28 2015
(r287471)
+++ head/share/misc/organization.dotFri Sep  4 20:15:20 2015
(r287472)
@@ -34,7 +34,7 @@ portmgr [label="Port Management Team\npo
 portmgrsecretary [label="Port Management Team 
Secretary\nportmgr-secret...@freebsd.org\nculot"]
 re [label="Primary Release Engineering Team\n...@freebsd.org\nkib, blackend, 
jpaetzel, hrs, kensmith"]
 secteam [label="Security Team\nsect...@freebsd.org\nsimon, qingli, 
delphij,\nremko, philip, stas, cperciva,\ncsjp, rwatson, miwi, bz"]
-portssecteam [label="Ports Security Team\nports-sect...@freebsd.org\nmiwi, 
rea, swills, wxs,\njgh, sbz, eadler, zi, remko, simon"]
+portssecteam [label="Ports Security Team\nports-sect...@freebsd.org\ndelphij, 
eadler, feld, jhg, rea, sbz, simon, swills, zi"]
 secteamsecretary [label="Security Team 
Secretary\nsecteam-secret...@freebsd.org\nremko"]
 securityofficer [label="Security Officer 
Team\nsecurity-offi...@freebsd.org\ncperciva, simon, nectar"]
 srccommitters [label="Src Committers\nsrc-committ...@freebsd.org"]
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r287471 - in head/sys/mips/rmi: . dev/nlge dev/xlr

[Sean Bruno]

Author: sbruno
Date: Fri Sep  4 19:57:28 2015
New Revision: 287471
URL: https://svnweb.freebsd.org/changeset/base/287471

Log:
  Remove rge driver from Broadcom XLR
  
  nlge(4) is supposed to deprecate rge(4) for Broadcom XLR when it was
  introduced 5 years ago.
  
  rge doesn't build on -CURRENT due to MII changes. All the XLR kernel confs
  use nlge. Let's get rid of the old driver for FreeBSD 11. We can use
  10-STABLE or SVN to go back and look at the old driver if needed.
  
  Differential Revision:https://reviews.freebsd.org/D3339
  Submitted by: kevin.bowl...@kev009.com

Deleted:
  head/sys/mips/rmi/dev/xlr/rge.c
  head/sys/mips/rmi/dev/xlr/rge.h
Modified:
  head/sys/mips/rmi/dev/nlge/if_nlge.c
  head/sys/mips/rmi/files.xlr
  head/sys/mips/rmi/iodi.c

Modified: head/sys/mips/rmi/dev/nlge/if_nlge.c
==
--- head/sys/mips/rmi/dev/nlge/if_nlge.cFri Sep  4 17:48:19 2015
(r287470)
+++ head/sys/mips/rmi/dev/nlge/if_nlge.cFri Sep  4 19:57:28 2015
(r287471)
@@ -1154,7 +1154,7 @@ nlna_config_pde(struct nlna_softc *sc)
cpumask = 0x1;
 #ifdef SMP
/*
- * rge may be called before SMP start in a BOOTP/NFSROOT
+ * nlna may be called before SMP start in a BOOTP/NFSROOT
  * setup. we will distribute packets to other cpus only when
  * the SMP is started.
 */

Modified: head/sys/mips/rmi/files.xlr
==
--- head/sys/mips/rmi/files.xlr Fri Sep  4 17:48:19 2015(r287470)
+++ head/sys/mips/rmi/files.xlr Fri Sep  4 19:57:28 2015(r287471)
@@ -11,8 +11,8 @@ mips/rmi/fmn.cstandard
 mips/rmi/intr_machdep.cstandard
 mips/rmi/mpwait.S  optional smp
 mips/rmi/xlr_i2c.c optional iic
-mips/rmi/uart_bus_xlr_iodi.c   optional uart 
-mips/rmi/uart_cpu_mips_xlr.c   optional uart 
+mips/rmi/uart_bus_xlr_iodi.c   optional uart
+mips/rmi/uart_cpu_mips_xlr.c   optional uart
 mips/rmi/xlr_pci.c optional pci
 mips/rmi/xlr_pcmcia.c  optional ata
 mips/rmi/xls_ehci.coptional usb ehci
@@ -20,7 +20,6 @@ mips/rmi/bus_space_rmi.c  standard
 mips/rmi/bus_space_rmi_pci.c   standard
 mips/rmi/dev/sec/rmisec.c  optional rmisec
 mips/rmi/dev/sec/rmilib.c  optional rmisec
-mips/rmi/dev/xlr/rge.c optional rge
 mips/rmi/dev/nlge/if_nlge.coptional nlge
-mips/rmi/dev/iic/max6657.c optional max6657 
-mips/rmi/dev/iic/at24co2n.coptional at24co2n 
+mips/rmi/dev/iic/max6657.c optional max6657
+mips/rmi/dev/iic/at24co2n.coptional at24co2n

Modified: head/sys/mips/rmi/iodi.c
==
--- head/sys/mips/rmi/iodi.cFri Sep  4 17:48:19 2015(r287470)
+++ head/sys/mips/rmi/iodi.cFri Sep  4 19:57:28 2015(r287471)
@@ -104,12 +104,12 @@ iodi_setup_intr(device_t dev, device_t c
cpu_establish_hardintr("uart", filt, intr, arg,
PIC_UART_0_IRQ, flags, cookiep);
pic_setup_intr(PIC_IRT_UART_0_INDEX, PIC_UART_0_IRQ, 0x1, 1);
-   } else if (strcmp(name, "rge") == 0 || strcmp(name, "nlge") == 0) {
+   } else if (strcmp(name, "nlge") == 0) {
int irq;
 
/* This is a hack to pass in the irq */
irq = (intptr_t)ires->__r_i;
-   cpu_establish_hardintr("rge", filt, intr, arg, irq, flags,
+   cpu_establish_hardintr("nlge", filt, intr, arg, irq, flags,
cookiep);
pic_setup_intr(irq - PIC_IRQ_BASE, irq, 0x1, 1);
} else if (strcmp(name, "ehci") == 0) {
@@ -224,58 +224,13 @@ iodi_attach(device_t dev)
if (xlr_board_info.ata)
device_add_child(dev, "ata", 0);
 
-   if (xlr_board_info.gmac_block[0].enabled) {
-   tmpd = device_add_child(dev, "rge", 0);
-   device_set_ivars(tmpd, _board_info.gmac_block[0]);
-
-   tmpd = device_add_child(dev, "rge", 1);
-   device_set_ivars(tmpd, _board_info.gmac_block[0]);
-
-   tmpd = device_add_child(dev, "rge", 2);
-   device_set_ivars(tmpd, _board_info.gmac_block[0]);
-
-   tmpd = device_add_child(dev, "rge", 3);
-   device_set_ivars(tmpd, _board_info.gmac_block[0]);
-   }
-   if (xlr_board_info.gmac_block[1].enabled) {
-   if (xlr_board_info.gmac_block[1].type == XLR_GMAC) {
-   tmpd = device_add_child(dev, "rge", 

svn commit: r287477 - head/sys/netinet6

[Alexander V. Chernikov]

Author: melifaro
Date: Sat Sep  5 05:54:09 2015
New Revision: 287477
URL: https://svnweb.freebsd.org/changeset/base/287477

Log:
  Make in6ifa_ifpwithaddr() take const param.
  Remove unneded DECONST from in6_lltable_rtcheck().

Modified:
  head/sys/netinet6/in6.c
  head/sys/netinet6/in6_var.h

Modified: head/sys/netinet6/in6.c
==
--- head/sys/netinet6/in6.c Sat Sep  5 05:33:20 2015(r287476)
+++ head/sys/netinet6/in6.c Sat Sep  5 05:54:09 2015(r287477)
@@ -1518,7 +1518,7 @@ in6ifa_ifwithaddr(const struct in6_addr 
  * ifaddr is returned referenced.
  */
 struct in6_ifaddr *
-in6ifa_ifpwithaddr(struct ifnet *ifp, struct in6_addr *addr)
+in6ifa_ifpwithaddr(struct ifnet *ifp, const struct in6_addr *addr)
 {
struct ifaddr *ifa;
 
@@ -2138,8 +2138,7 @@ in6_lltable_rtcheck(struct ifnet *ifp,
 * Create an ND6 cache for an IPv6 neighbor
 * that is not covered by our own prefix.
 */
-   /* XXX ifaof_ifpforaddr should take a const param */
-   ifa = ifaof_ifpforaddr(__DECONST(struct sockaddr *, l3addr), 
ifp);
+   ifa = ifaof_ifpforaddr(l3addr, ifp);
if (ifa != NULL) {
ifa_free(ifa);
if (rt != NULL)

Modified: head/sys/netinet6/in6_var.h
==
--- head/sys/netinet6/in6_var.h Sat Sep  5 05:33:20 2015(r287476)
+++ head/sys/netinet6/in6_var.h Sat Sep  5 05:54:09 2015(r287477)
@@ -808,7 +808,7 @@ int in6_domifmtu(struct ifnet *);
 void   in6_setmaxmtu(void);
 intin6_if2idlen(struct ifnet *);
 struct in6_ifaddr *in6ifa_ifpforlinklocal(struct ifnet *, int);
-struct in6_ifaddr *in6ifa_ifpwithaddr(struct ifnet *, struct in6_addr *);
+struct in6_ifaddr *in6ifa_ifpwithaddr(struct ifnet *, const struct in6_addr *);
 struct in6_ifaddr *in6ifa_ifwithaddr(const struct in6_addr *, uint32_t);
 struct in6_ifaddr *in6ifa_llaonifp(struct ifnet *);
 intin6_addr2zoneid(struct ifnet *, struct in6_addr *, u_int32_t *);
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r287476 - head/sys/net

[Alexander V. Chernikov]

Author: melifaro
Date: Sat Sep  5 05:33:20 2015
New Revision: 287476
URL: https://svnweb.freebsd.org/changeset/base/287476

Log:
  Constantify lookup key in ifa_ifwith* functions.
  Some places in our network stack already have const
  arguments (like if_output() routines and LLE functions).
  
  Code using ifa_ifwith (and similar functins) along with
  LLE/_output functions is currently bound to use tricks
  like __DECONST(). Provide a cleaner way by making sockaddr
  lookup key really constant.
  
  MFC after:2 weeks
  Differential Revision:https://reviews.freebsd.org/D3464

Modified:
  head/sys/net/if.c
  head/sys/net/if_dl.h
  head/sys/net/if_var.h
  head/sys/net/route.c
  head/sys/net/route.h

Modified: head/sys/net/if.c
==
--- head/sys/net/if.c   Sat Sep  5 03:27:23 2015(r287475)
+++ head/sys/net/if.c   Sat Sep  5 05:33:20 2015(r287476)
@@ -1624,18 +1624,18 @@ ifa_switch_loopback_route(struct ifaddr 
  */
 
 #definesa_dl_equal(a1, a2) \
-   struct sockaddr_dl *)(a1))->sdl_len ==  \
-((struct sockaddr_dl *)(a2))->sdl_len) &&  \
-(bcmp(LLADDR((struct sockaddr_dl *)(a1)),  \
-  LLADDR((struct sockaddr_dl *)(a2)),  \
-  ((struct sockaddr_dl *)(a1))->sdl_alen) == 0))
+   const struct sockaddr_dl *)(a1))->sdl_len ==\
+((const struct sockaddr_dl *)(a2))->sdl_len) &&\
+(bcmp(CLLADDR((const struct sockaddr_dl *)(a1)),   \
+  CLLADDR((const struct sockaddr_dl *)(a2)),   \
+  ((const struct sockaddr_dl *)(a1))->sdl_alen) == 0))
 
 /*
  * Locate an interface based on a complete address.
  */
 /*ARGSUSED*/
 static struct ifaddr *
-ifa_ifwithaddr_internal(struct sockaddr *addr, int getref)
+ifa_ifwithaddr_internal(const struct sockaddr *addr, int getref)
 {
struct ifnet *ifp;
struct ifaddr *ifa;
@@ -1672,14 +1672,14 @@ done:
 }
 
 struct ifaddr *
-ifa_ifwithaddr(struct sockaddr *addr)
+ifa_ifwithaddr(const struct sockaddr *addr)
 {
 
return (ifa_ifwithaddr_internal(addr, 1));
 }
 
 int
-ifa_ifwithaddr_check(struct sockaddr *addr)
+ifa_ifwithaddr_check(const struct sockaddr *addr)
 {
 
return (ifa_ifwithaddr_internal(addr, 0) != NULL);
@@ -1690,7 +1690,7 @@ ifa_ifwithaddr_check(struct sockaddr *ad
  */
 /* ARGSUSED */
 struct ifaddr *
-ifa_ifwithbroadaddr(struct sockaddr *addr, int fibnum)
+ifa_ifwithbroadaddr(const struct sockaddr *addr, int fibnum)
 {
struct ifnet *ifp;
struct ifaddr *ifa;
@@ -1725,7 +1725,7 @@ done:
  */
 /*ARGSUSED*/
 struct ifaddr *
-ifa_ifwithdstaddr(struct sockaddr *addr, int fibnum)
+ifa_ifwithdstaddr(const struct sockaddr *addr, int fibnum)
 {
struct ifnet *ifp;
struct ifaddr *ifa;
@@ -1760,20 +1760,20 @@ done:
  * is most specific found.
  */
 struct ifaddr *
-ifa_ifwithnet(struct sockaddr *addr, int ignore_ptp, int fibnum)
+ifa_ifwithnet(const struct sockaddr *addr, int ignore_ptp, int fibnum)
 {
struct ifnet *ifp;
struct ifaddr *ifa;
struct ifaddr *ifa_maybe = NULL;
u_int af = addr->sa_family;
-   char *addr_data = addr->sa_data, *cplim;
+   const char *addr_data = addr->sa_data, *cplim;
 
/*
 * AF_LINK addresses can be looked up directly by their index number,
 * so do that if we can.
 */
if (af == AF_LINK) {
-   struct sockaddr_dl *sdl = (struct sockaddr_dl *)addr;
+   const struct sockaddr_dl *sdl = (const struct sockaddr_dl *)addr;
if (sdl->sdl_index && sdl->sdl_index <= V_if_index)
return (ifaddr_byindex(sdl->sdl_index));
}
@@ -1790,7 +1790,7 @@ ifa_ifwithnet(struct sockaddr *addr, int
continue;
IF_ADDR_RLOCK(ifp);
TAILQ_FOREACH(ifa, >if_addrhead, ifa_link) {
-   char *cp, *cp2, *cp3;
+   const char *cp, *cp2, *cp3;
 
if (ifa->ifa_addr->sa_family != af)
 next:  continue;
@@ -1863,10 +1863,10 @@ done:
  * a given address.
  */
 struct ifaddr *
-ifaof_ifpforaddr(struct sockaddr *addr, struct ifnet *ifp)
+ifaof_ifpforaddr(const struct sockaddr *addr, struct ifnet *ifp)
 {
struct ifaddr *ifa;
-   char *cp, *cp2, *cp3;
+   const char *cp, *cp2, *cp3;
char *cplim;
struct ifaddr *ifa_maybe = NULL;
u_int af = addr->sa_family;
@@ -2924,7 +2924,7 @@ if_allmulti(struct ifnet *ifp, int onswi
 }
 
 struct ifmultiaddr *
-if_findmulti(struct ifnet *ifp, struct sockaddr *sa)
+if_findmulti(struct ifnet *ifp, const struct sockaddr *sa)
 {
struct ifmultiaddr *ifma;
 

Modified: head/sys/net/if_dl.h
==

svn commit: r287475 - head/sys/boot/efi/loader/arch/amd64

[Marcel Moolenaar]

Author: marcel
Date: Sat Sep  5 03:27:23 2015
New Revision: 287475
URL: https://svnweb.freebsd.org/changeset/base/287475

Log:
  My MacBook has UGA only, but we fail to detect any changes
  in the frame buffer when we flip pixels. Allow the detection
  to be bypassed by setting the uga_framebuffer and uga_stride
  variables. The kernel console works fine even when we can't
  detect pixel changes in the frame buffer, which indicates
  that the problem could be with reading from the frame buffer
  and not writing to it.

Modified:
  head/sys/boot/efi/loader/arch/amd64/framebuffer.c

Modified: head/sys/boot/efi/loader/arch/amd64/framebuffer.c
==
--- head/sys/boot/efi/loader/arch/amd64/framebuffer.c   Sat Sep  5 01:00:02 
2015(r287474)
+++ head/sys/boot/efi/loader/arch/amd64/framebuffer.c   Sat Sep  5 03:27:23 
2015(r287475)
@@ -183,29 +183,24 @@ efifb_uga_find_pixel(EFI_UGA_DRAW_PROTOC
return (-1);
 }
 
-static EFI_STATUS
-efifb_uga_detect_framebuffer(EFI_UGA_DRAW_PROTOCOL *uga,
-EFI_PCI_IO_PROTOCOL **pciiop, uint64_t *addrp, uint64_t *sizep)
+static EFI_PCI_IO_PROTOCOL *
+efifb_uga_get_pciio(void)
 {
EFI_PCI_IO_PROTOCOL *pciio;
EFI_HANDLE *buf, *hp;
-   uint8_t *resattr;
-   uint64_t a, addr, s, size;
-   ssize_t ofs;
EFI_STATUS status;
UINTN bufsz;
-   u_int bar;
 
/* Get all handles that support the UGA protocol. */
bufsz = 0;
status = BS->LocateHandle(ByProtocol, _guid, NULL, , NULL);
if (status != EFI_BUFFER_TOO_SMALL)
-   return (status);
+   return (NULL);
buf = malloc(bufsz);
status = BS->LocateHandle(ByProtocol, _guid, NULL, , buf);
if (status != EFI_SUCCESS) {
free(buf);
-   return (status);
+   return (NULL);
}
bufsz /= sizeof(EFI_HANDLE);
 
@@ -213,12 +208,24 @@ efifb_uga_detect_framebuffer(EFI_UGA_DRA
pciio = NULL;
for (hp = buf; hp < buf + bufsz; hp++) {
status = BS->HandleProtocol(*hp, _guid, (void **));
-   if (status == EFI_SUCCESS)
-   break;
+   if (status == EFI_SUCCESS) {
+   free(buf);
+   return (pciio);
+   }
}
free(buf);
-   if (status != EFI_SUCCESS || pciio == NULL)
-   return (EFI_NOT_FOUND);
+   return (NULL);
+}
+
+static EFI_STATUS
+efifb_uga_detect_framebuffer(EFI_UGA_DRAW_PROTOCOL *uga,
+EFI_PCI_IO_PROTOCOL *pciio, uint64_t *addrp, uint64_t *sizep)
+{
+   uint8_t *resattr;
+   uint64_t a, addr, s, size;
+   ssize_t ofs;
+   EFI_STATUS status;
+   u_int bar;
 
/* Attempt to get the frame buffer address (imprecise). */
addr = 0;
@@ -265,7 +272,6 @@ efifb_uga_detect_framebuffer(EFI_UGA_DRA
addr += ofs;
size -= ofs;
 
-   *pciiop = pciio;
*addrp = addr;
*sizep = size;
return (0);
@@ -275,6 +281,7 @@ static int
 efifb_from_uga(struct efi_fb *efifb, EFI_UGA_DRAW_PROTOCOL *uga)
 {
EFI_PCI_IO_PROTOCOL *pciio;
+   char *ev, *p;
EFI_STATUS status;
ssize_t ofs;
uint32_t horiz, vert, depth, refresh;
@@ -287,18 +294,37 @@ efifb_from_uga(struct efi_fb *efifb, EFI
efifb_mask_from_pixfmt(efifb, PixelBlueGreenRedReserved8BitPerColor,
NULL);
 
-   /* Try and find the frame buffer. */
-   status = efifb_uga_detect_framebuffer(uga, , >fb_addr,
-   >fb_size);
-   if (EFI_ERROR(status))
+   pciio = efifb_uga_get_pciio();
+   if (pciio == NULL)
return (1);
 
-   /* Try and detect the stride. */
-   ofs = efifb_uga_find_pixel(uga, 1, pciio, efifb->fb_addr,
-   efifb->fb_size);
-   if (ofs == -1)
-   return (1);
-   efifb->fb_stride = ofs >> 2;
+   ev = getenv("uga_framebuffer");
+   if (ev == NULL) {
+   /* Try to find the frame buffer. */
+   status = efifb_uga_detect_framebuffer(uga, pciio,
+   >fb_addr, >fb_size);
+   if (EFI_ERROR(status))
+   return (1);
+   } else {
+   efifb->fb_size = horiz * vert * 4;
+   efifb->fb_addr = strtoul(ev, , 0);
+   if (*p != '\0')
+   return (1);
+   }
+
+   ev = getenv("uga_stride");
+   if (ev == NULL) {
+   /* Try to detect the stride. */
+   ofs = efifb_uga_find_pixel(uga, 1, pciio, efifb->fb_addr,
+   efifb->fb_size);
+   if (ofs == -1)
+   return (1);
+   efifb->fb_stride = ofs >> 2;
+   } else {
+   efifb->fb_stride = strtoul(ev, , 0);
+   if (*p != '\0')
+   return (1);
+   }
return (0);
 }
 

svn commit: r287473 - in head/usr.sbin: . sesutil

[Baptiste Daroussin]

Author: bapt
Date: Sat Sep  5 00:06:01 2015
New Revision: 287473
URL: https://svnweb.freebsd.org/changeset/base/287473

Log:
  Add a new sesutil(8) utility
  
  This is an utility for managing SCSI Enclosure Services (SES) device.
  
  For now only one command is supported "locate" which will change the test of 
the
  external LED associated to a given disk.
  
  Usage if the following:
  sesutil locate disk [on|off]
  
  Disk can be a device name: "da12" or a special keyword: "all".
  
  Reviewed by:  mav
  MFC after:1 month
  Relnotes: yes
  Sponsored by: gandi.net
  Differential Revision:https://reviews.freebsd.org/D3544

Added:
  head/usr.sbin/sesutil/
  head/usr.sbin/sesutil/Makefile   (contents, props changed)
  head/usr.sbin/sesutil/sesutil.8   (contents, props changed)
  head/usr.sbin/sesutil/sesutil.c   (contents, props changed)
Modified:
  head/usr.sbin/Makefile

Modified: head/usr.sbin/Makefile
==
--- head/usr.sbin/Makefile  Fri Sep  4 20:15:20 2015(r287472)
+++ head/usr.sbin/Makefile  Sat Sep  5 00:06:01 2015(r287473)
@@ -74,6 +74,7 @@ SUBDIR=   adduser \
rtprio \
service \
services_mkdb \
+   sesutil \
setfib \
setfmac \
setpmac \

Added: head/usr.sbin/sesutil/Makefile
==
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ head/usr.sbin/sesutil/Makefile  Sat Sep  5 00:06:01 2015
(r287473)
@@ -0,0 +1,6 @@
+# $FreeBSD$
+
+PROG=  sesutil
+MAN=   sesutil.8
+
+.include 

Added: head/usr.sbin/sesutil/sesutil.8
==
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ head/usr.sbin/sesutil/sesutil.8 Sat Sep  5 00:06:01 2015
(r287473)
@@ -0,0 +1,73 @@
+.\" Copyright (c) 2015 Baptiste Daroussin 
+.\" All rights reserved.
+.\"
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\" 1. Redistributions of source code must retain the above copyright
+.\"notice, this list of conditions and the following disclaimer.
+.\" 2. Redistributions in binary form must reproduce the above copyright
+.\"notice, this list of conditions and the following disclaimer in the
+.\"documentation and/or other materials provided with the distribution.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
+.\"
+.\" $FreeBSD$
+.\"
+.Dd September 1, 2015
+.Dt SESUTIL 8
+.Os
+.Sh NAME
+.Nm sesutil
+.Nd Utility for managing SCSI Enclosure Services (SES) device
+.Sh SYNOPSIS
+.Nm
+.Cm locate Ar disk Bq on|off
+.Sh DESCRIPTION
+The
+.Nm
+utility can be used to modify various parameter on SCSI Enclosure Services
+(SES) device.
+.Pp
+List of supported commands:
+.Bl -tag -width indent
+.It Cm locate Ar disk Bq on|off
+Change the state of the external LED associated with
+.Ar disk .
+.Ar disk
+can be the device name of the disk, like
+.Cm da12 ,
+or
+.Cm all .
+to indicate all disks attached to SES controllers.
+.El
+.Sh EXAMPLES
+Turn off all external LEDs:
+.Pp
+.Dl Nm Cm locate all off
+.Pp
+Turn on the external LED of drive
+.Pa da15 :
+.Pp
+.Dl Nm Cm locate da15 on
+.Sh SEE ALSO
+.Xr ses 4
+.Sh HISTORY
+The
+.Nm
+utility first appeared in
+.Fx 11.0 .
+.Sh AUTHORS
+The
+.Nm utility was written by
+.An Baptiste Daroussin Aq Mt b...@freebsd.org .

Added: head/usr.sbin/sesutil/sesutil.c
==
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ head/usr.sbin/sesutil/sesutil.c Sat Sep  5 00:06:01 2015
(r287473)
@@ -0,0 +1,225 @@
+/*-
+ * Copyright (c) 2015 Baptiste Daroussin 
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the 

svn commit: r287474 - head/share/misc

[Mark Felder]

Author: feld (ports committer)
Date: Sat Sep  5 01:00:02 2015
New Revision: 287474
URL: https://svnweb.freebsd.org/changeset/base/287474

Log:
  jhg -> jgh
  
  Submitted by: junovitch
  Approved by:  delphij (implicit)

Modified:
  head/share/misc/organization.dot

Modified: head/share/misc/organization.dot
==
--- head/share/misc/organization.dotSat Sep  5 00:06:01 2015
(r287473)
+++ head/share/misc/organization.dotSat Sep  5 01:00:02 2015
(r287474)
@@ -34,7 +34,7 @@ portmgr [label="Port Management Team\npo
 portmgrsecretary [label="Port Management Team 
Secretary\nportmgr-secret...@freebsd.org\nculot"]
 re [label="Primary Release Engineering Team\n...@freebsd.org\nkib, blackend, 
jpaetzel, hrs, kensmith"]
 secteam [label="Security Team\nsect...@freebsd.org\nsimon, qingli, 
delphij,\nremko, philip, stas, cperciva,\ncsjp, rwatson, miwi, bz"]
-portssecteam [label="Ports Security Team\nports-sect...@freebsd.org\ndelphij, 
eadler, feld, jhg, rea, sbz, simon, swills, zi"]
+portssecteam [label="Ports Security Team\nports-sect...@freebsd.org\ndelphij, 
eadler, feld, jgh, rea, sbz, simon, swills, zi"]
 secteamsecretary [label="Security Team 
Secretary\nsecteam-secret...@freebsd.org\nremko"]
 securityofficer [label="Security Officer 
Team\nsecurity-offi...@freebsd.org\ncperciva, simon, nectar"]
 srccommitters [label="Src Committers\nsrc-committ...@freebsd.org"]
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r287454 - head/contrib/file/src

[Xin LI]

Author: delphij
Date: Fri Sep  4 08:04:12 2015
New Revision: 287454
URL: https://svnweb.freebsd.org/changeset/base/287454

Log:
  Fix build.

Modified:
  head/contrib/file/src/readelf.c

Modified: head/contrib/file/src/readelf.c
==
--- head/contrib/file/src/readelf.c Fri Sep  4 05:56:14 2015
(r287453)
+++ head/contrib/file/src/readelf.c Fri Sep  4 08:04:12 2015
(r287454)
@@ -1052,7 +1052,7 @@ doshn(struct magic_set *ms, int clazz, i
/* Things we can determine when we seek */
switch (xsh_type) {
case SHT_NOTE:
-   if (xsh_size + xsh_offset > (uintmax_t)fsize)  {
+   if (xsh_size + (uintmax_t)xsh_offset > 
(uintmax_t)fsize)  {
if (file_printf(ms,
", note offset/size 0x%jx+0x%jx exceeds"
" file size 0x%jx", (uintmax_t)xsh_offset,
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Re: svn commit: r287283 - head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs

[Steven Hartland]

Would it be worth commenting in the code about this, so we don't make 
the mistake again?


On 03/09/2015 18:45, Andriy Gapon wrote:

>Date: Sat Aug


___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"