svn commit: r195917 - head/etc

2009-07-27 Thread Colin Percival
Author: cperciva
Date: Mon Jul 27 20:24:00 2009
New Revision: 195917
URL: http://svn.freebsd.org/changeset/base/195917

Log:
  Add INDEX-8 to the default portsnap configuration file, and remove INDEX-5.
  The Portsnap buildbox now generates teh bits needed for portsnap to produce
  INDEX-8; and it hasn't built INDEX-5 for a long time, although the bits are
  still distributed for an INDEX-5 from when FreeBSD 5.x reached its EoL.
  
  Approved by:  re (kib)
  MFC after:3 days (INDEX-8 addition only)

Modified:
  head/etc/portsnap.conf

Modified: head/etc/portsnap.conf
==
--- head/etc/portsnap.conf  Mon Jul 27 20:17:20 2009(r195916)
+++ head/etc/portsnap.conf  Mon Jul 27 20:24:00 2009(r195917)
@@ -30,6 +30,6 @@ KEYPRINT=9b5feee6d69f170e3dd0a2c8e469ddb
 # REFUSE korean polish portuguese russian ukrainian vietnamese
 
 # List of INDEX files to build and the DESCRIBE file to use for each
-INDEX INDEX-5 DESCRIBE.5
 INDEX INDEX-6 DESCRIBE.6
 INDEX INDEX-7 DESCRIBE.7
+INDEX INDEX-8 DESCRIBE.8
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"


svn commit: r195916 - in head/sys/dev/usb: . wlan

2009-07-27 Thread Weongyo Jeong
Author: weongyo
Date: Mon Jul 27 20:17:20 2009
New Revision: 195916
URL: http://svn.freebsd.org/changeset/base/195916

Log:
  adds DLINK2 DWA120 device.
  
  PR:   usb/136950
  Reported by:  Alexander Kuznetsov 
  Approved by:  re (kib)

Modified:
  head/sys/dev/usb/usbdevs
  head/sys/dev/usb/wlan/if_uath.c

Modified: head/sys/dev/usb/usbdevs
==
--- head/sys/dev/usb/usbdevsMon Jul 27 18:07:44 2009(r195915)
+++ head/sys/dev/usb/usbdevsMon Jul 27 20:17:20 2009(r195916)
@@ -1179,6 +1179,8 @@ product DLINK2 DWLG122C1  0x3c03  DWL-G122
 product DLINK2 WUA1340 0x3c04  WUA-1340
 product DLINK2 DWA111  0x3c06  DWA-111
 product DLINK2 DWA110  0x3c07  DWA-110
+product DLINK2 DWA120_NF   0x3c0d  DWA-120 (no firmware)
+product DLINK2 DWA120  0x3c0e  DWA-120
 
 /* DMI products */
 product DMI CFSM_RW0xa109  CF/SM Reader/Writer

Modified: head/sys/dev/usb/wlan/if_uath.c
==
--- head/sys/dev/usb/wlan/if_uath.c Mon Jul 27 18:07:44 2009
(r195915)
+++ head/sys/dev/usb/wlan/if_uath.c Mon Jul 27 20:17:20 2009
(r195916)
@@ -180,6 +180,7 @@ static const struct usb_device_id uath_d
UATH_DEV(DLINK, DWLAG122),
UATH_DEV(DLINK, DWLAG132),
UATH_DEV(DLINK, DWLG132),
+   UATH_DEV(DLINK2,DWA120),
UATH_DEV(GIGASET,   AR5523),
UATH_DEV(GIGASET,   SMCWUSBTG),
UATH_DEV(GLOBALSUN, AR5523_1),
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"


svn commit: r195915 - head/share/man/man4

2009-07-27 Thread Weongyo Jeong
Author: weongyo
Date: Mon Jul 27 18:07:44 2009
New Revision: 195915
URL: http://svn.freebsd.org/changeset/base/195915

Log:
  urtw(4) supports RTL8187B chipset now.
  
  Approved by:  re (kib)

Modified:
  head/share/man/man4/urtw.4

Modified: head/share/man/man4/urtw.4
==
--- head/share/man/man4/urtw.4  Mon Jul 27 17:08:06 2009(r195914)
+++ head/share/man/man4/urtw.4  Mon Jul 27 18:07:44 2009(r195915)
@@ -24,12 +24,12 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd November 15, 2008
+.Dd July 25, 2009
 .Dt URTW 4
 .Os
 .Sh NAME
 .Nm urtw
-.Nd Realtek RTL8187L USB IEEE 802.11b/g wireless network device
+.Nd Realtek RTL8187B/L USB IEEE 802.11b/g wireless network device
 .Sh SYNOPSIS
 To compile this driver into the kernel,
 place the following lines in your kernel configuration file:
@@ -52,7 +52,7 @@ if_urtw_load="YES"
 The
 .Nm
 driver supports USB 802.11b/g wireless adapters based on the
-Realtek RTL8187L.
+Realtek RTL8187B/L.
 .Pp
 .Nm
 supports
@@ -66,7 +66,7 @@ For more information on configuring this
 .Sh HARDWARE
 The
 .Nm
-driver supports Realtek RTL8187L based wireless network devices, including:
+driver supports Realtek RTL8187B/L based wireless network devices, including:
 .Pp
 .Bl -column "Shuttle XPC Accessory PN20" "RTL8225" "USB" -compact -offset 6n
 .It Em "Card   Radio   Bus"
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"


svn commit: r195914 - in head/sys: net netinet netinet6

2009-07-27 Thread Qing Li
Author: qingli
Date: Mon Jul 27 17:08:06 2009
New Revision: 195914
URL: http://svn.freebsd.org/changeset/base/195914

Log:
  This patch does the following:
  
  - Allow loopback route to be installed for address assigned to
interface of IFF_POINTOPOINT type.
  - Install loopback route for an IPv4 interface addreess when the
"useloopback" sysctl variable is enabled. Similarly, install
loopback route for an IPv6 interface address when the sysctl variable
"nd6_useloopback" is enabled. Deleting loopback routes for interface
addresses is unconditional in case these sysctl variables were
disabled after an interface address has been assigned.
  
  Reviewed by:  bz
  Approved by:  re

Modified:
  head/sys/net/if_var.h
  head/sys/netinet/if_ether.c
  head/sys/netinet/in.c
  head/sys/netinet6/in6.c

Modified: head/sys/net/if_var.h
==
--- head/sys/net/if_var.h   Mon Jul 27 16:11:44 2009(r195913)
+++ head/sys/net/if_var.h   Mon Jul 27 17:08:06 2009(r195914)
@@ -784,11 +784,13 @@ VNET_DECLARE(struct ifnethead, ifnet);
 VNET_DECLARE(struct ifgrouphead, ifg_head);
 VNET_DECLARE(int, if_index);
 VNET_DECLARE(struct ifnet *, loif);/* first loopback interface */
+VNET_DECLARE(int, useloopback);
 
 #defineV_ifnet VNET(ifnet)
 #defineV_ifg_head  VNET(ifg_head)
 #defineV_if_index  VNET(if_index)
 #defineV_loif  VNET(loif)
+#defineV_useloopback   VNET(useloopback)
 
 extern int ifqmaxlen;
 

Modified: head/sys/netinet/if_ether.c
==
--- head/sys/netinet/if_ether.c Mon Jul 27 16:11:44 2009(r195913)
+++ head/sys/netinet/if_ether.c Mon Jul 27 17:08:06 2009(r195914)
@@ -81,17 +81,17 @@ __FBSDID("$FreeBSD$");
 SYSCTL_DECL(_net_link_ether);
 SYSCTL_NODE(_net_link_ether, PF_INET, inet, CTLFLAG_RW, 0, "");
 
+VNET_DEFINE(int, useloopback) = 1; /* use loopback interface for
+* local traffic */
+
 /* timer values */
 static VNET_DEFINE(int, arpt_keep) = (20*60);  /* once resolved, good for 20
 * minutes */
 static VNET_DEFINE(int, arp_maxtries) = 5;
-static VNET_DEFINE(int, useloopback) = 1;  /* use loopback interface for
-* local traffic */
 static VNET_DEFINE(int, arp_proxyall);
 
 #defineV_arpt_keep VNET(arpt_keep)
 #defineV_arp_maxtries  VNET(arp_maxtries)
-#defineV_useloopback   VNET(useloopback)
 #defineV_arp_proxyall  VNET(arp_proxyall)
 
 SYSCTL_VNET_INT(_net_link_ether_inet, OID_AUTO, max_age, CTLFLAG_RW,

Modified: head/sys/netinet/in.c
==
--- head/sys/netinet/in.c   Mon Jul 27 16:11:44 2009(r195913)
+++ head/sys/netinet/in.c   Mon Jul 27 17:08:06 2009(r195914)
@@ -49,6 +49,7 @@ __FBSDID("$FreeBSD$");
 #include 
 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -918,7 +919,7 @@ in_ifinit(struct ifnet *ifp, struct in_i
/*
 * add a loopback route to self
 */
-   if (!(ifp->if_flags & (IFF_LOOPBACK | IFF_POINTOPOINT))) {
+   if (V_useloopback && !(ifp->if_flags & IFF_LOOPBACK)) {
bzero(&info, sizeof(info));
info.rti_ifp = V_loif;
info.rti_flags = ia->ia_flags | RTF_HOST | RTF_STATIC;
@@ -1027,8 +1028,18 @@ in_scrubprefix(struct in_ifaddr *target)
if ((target->ia_flags & IFA_ROUTE) == 0)
return (0);
 
+   /*
+* Remove the loopback route to the interface address.
+* The "useloopback" setting is not consulted because if the
+* user configures an interface address, turns off this
+* setting, and then tries to delete that interface address,
+* checking the current setting of "useloopback" would leave
+* that interface address loopback route untouched, which
+* would be wrong. Therefore the interface address loopback route
+* deletion is unconditional.
+*/
if ((target->ia_addr.sin_addr.s_addr != INADDR_ANY) &&
-   !(target->ia_ifp->if_flags & (IFF_LOOPBACK | IFF_POINTOPOINT))) {
+   !(target->ia_ifp->if_flags & IFF_LOOPBACK)) {
bzero(&null_sdl, sizeof(null_sdl));
null_sdl.sdl_len = sizeof(null_sdl);
null_sdl.sdl_family = AF_LINK;

Modified: head/sys/netinet6/in6.c
==
--- head/sys/netinet6/in6.c Mon Jul 27 16:11:44 2009(r195913)
+++ head/sys/netinet6/in6.c Mon Jul 27 17:08:06 2009(r195914)
@@ -1191,7 +1191,11 @@ in6_purgeaddr(struct ifaddr *ifa)
ifa_re

svn commit: r195913 - in stable/7/sys: . contrib/pf dev/drm

2009-07-27 Thread Robert Noland
Author: rnoland
Date: Mon Jul 27 16:11:44 2009
New Revision: 195913
URL: http://svn.freebsd.org/changeset/base/195913

Log:
  MFC r195501
  
  Add support for Radeon HD 4770 (RV740) chips.

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)
  stable/7/sys/dev/drm/drm_pciids.h
  stable/7/sys/dev/drm/r600_cp.c
  stable/7/sys/dev/drm/radeon_drv.h

Modified: stable/7/sys/dev/drm/drm_pciids.h
==
--- stable/7/sys/dev/drm/drm_pciids.h   Mon Jul 27 16:05:51 2009
(r195912)
+++ stable/7/sys/dev/drm/drm_pciids.h   Mon Jul 27 16:11:44 2009
(r195913)
@@ -257,6 +257,11 @@
{0x1002, 0x940A, CHIP_R600|RADEON_NEW_MEMMAP, "ATI FireGL V8650"}, \
{0x1002, 0x940B, CHIP_R600|RADEON_NEW_MEMMAP, "ATI FireGL V8600"}, \
{0x1002, 0x940F, CHIP_R600|RADEON_NEW_MEMMAP, "ATI FireGL V7600"}, \
+   {0x1002, 0x94A0, CHIP_RV740|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP, "ATI 
Mobility Radeon HD 4830"}, \
+   {0x1002, 0x94A1, CHIP_RV740|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP, "ATI 
Mobility Radeon HD 4850"}, \
+   {0x1002, 0x94B1, CHIP_RV740|RADEON_NEW_MEMMAP, "ATI RV740"}, \
+   {0x1002, 0x94B3, CHIP_RV740|RADEON_NEW_MEMMAP, "ATI Radeon HD 4770"}, \
+   {0x1002, 0x94B5, CHIP_RV740|RADEON_NEW_MEMMAP, "ATI Radeon HD 4770"}, \
{0x1002, 0x94C0, CHIP_RV610|RADEON_NEW_MEMMAP, "RV610"}, \
{0x1002, 0x94C1, CHIP_RV610|RADEON_NEW_MEMMAP, "Radeon HD 2400 XT"}, \
{0x1002, 0x94C3, CHIP_RV610|RADEON_NEW_MEMMAP, "Radeon HD 2400 Pro"}, \

Modified: stable/7/sys/dev/drm/r600_cp.c
==
--- stable/7/sys/dev/drm/r600_cp.c  Mon Jul 27 16:05:51 2009
(r195912)
+++ stable/7/sys/dev/drm/r600_cp.c  Mon Jul 27 16:11:44 2009
(r195913)
@@ -421,7 +421,8 @@ static void r700_cp_load_microcode(drm_r
cp  = RV770_cp_microcode;
break;
case CHIP_RV730:
-   DRM_INFO("Loading RV730 Microcode\n");
+   case CHIP_RV740:
+   DRM_INFO("Loading RV730/RV740 Microcode\n");
pfp = RV730_pfp_microcode;
cp  = RV730_cp_microcode;
break;
@@ -1244,6 +1245,31 @@ static void r700_gfx_init(struct drm_dev
dev_priv->r700_sc_hiz_tile_fifo_size = 0x30;
dev_priv->r700_sc_earlyz_tile_fifo_fize = 0x130;
break;
+   case CHIP_RV740:
+   dev_priv->r600_max_pipes = 4;
+   dev_priv->r600_max_tile_pipes = 4;
+   dev_priv->r600_max_simds = 8;
+   dev_priv->r600_max_backends = 4;
+   dev_priv->r600_max_gprs = 256;
+   dev_priv->r600_max_threads = 248;
+   dev_priv->r600_max_stack_entries = 512;
+   dev_priv->r600_max_hw_contexts = 8;
+   dev_priv->r600_max_gs_threads = 16 * 2;
+   dev_priv->r600_sx_max_export_size = 256;
+   dev_priv->r600_sx_max_export_pos_size = 32;
+   dev_priv->r600_sx_max_export_smx_size = 224;
+   dev_priv->r600_sq_num_cf_insts = 2;
+
+   dev_priv->r700_sx_num_of_sets = 7;
+   dev_priv->r700_sc_prim_fifo_size = 0x100;
+   dev_priv->r700_sc_hiz_tile_fifo_size = 0x30;
+   dev_priv->r700_sc_earlyz_tile_fifo_fize = 0x130;
+
+   if (dev_priv->r600_sx_max_export_pos_size > 16) {
+   dev_priv->r600_sx_max_export_pos_size -= 16;
+   dev_priv->r600_sx_max_export_smx_size += 16;
+   }
+   break;
case CHIP_RV730:
dev_priv->r600_max_pipes = 2;
dev_priv->r600_max_tile_pipes = 4;
@@ -1263,6 +1289,11 @@ static void r700_gfx_init(struct drm_dev
dev_priv->r700_sc_prim_fifo_size = 0xf9;
dev_priv->r700_sc_hiz_tile_fifo_size = 0x30;
dev_priv->r700_sc_earlyz_tile_fifo_fize = 0x130;
+
+   if (dev_priv->r600_sx_max_export_pos_size > 16) {
+   dev_priv->r600_sx_max_export_pos_size -= 16;
+   dev_priv->r600_sx_max_export_smx_size += 16;
+   }
break;
case CHIP_RV710:
dev_priv->r600_max_pipes = 2;
@@ -1430,6 +1461,7 @@ static void r700_gfx_init(struct drm_dev
case CHIP_RV770:
sq_ms_fifo_sizes |= R600_FETCH_FIFO_HIWATER(0x1);
break;
+   case CHIP_RV740:
case CHIP_RV730:
case CHIP_RV710:
default:
@@ -1507,6 +1539,7 @@ static void r700_gfx_init(struct drm_dev
 
switch (dev_priv->flags & RADEON_FAMILY_MASK) {
case CHIP_RV770:
+   case CHIP_RV740:
case CHIP_RV730:
gs_prim_buffer_depth = 384;
break;

Modified: stable/7/sys/dev/drm/radeon_drv.h
==

svn commit: r195912 - in stable/7/sys: . contrib/pf dev/drm

2009-07-27 Thread Robert Noland
Author: rnoland
Date: Mon Jul 27 16:05:51 2009
New Revision: 195912
URL: http://svn.freebsd.org/changeset/base/195912

Log:
  MFC 
r194741,194745-194746,194748-194749,194759,194960,194963,194965-194966,194969,194986,194996
  
  This pulls in numerous vblank related fixes from HEAD.

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)
  stable/7/sys/dev/drm/drmP.h
  stable/7/sys/dev/drm/drm_drv.c
  stable/7/sys/dev/drm/drm_irq.c
  stable/7/sys/dev/drm/drm_sysctl.c
  stable/7/sys/dev/drm/i915_dma.c
  stable/7/sys/dev/drm/i915_drv.c
  stable/7/sys/dev/drm/i915_drv.h
  stable/7/sys/dev/drm/i915_irq.c
  stable/7/sys/dev/drm/radeon_cp.c
  stable/7/sys/dev/drm/radeon_irq.c

Modified: stable/7/sys/dev/drm/drmP.h
==
--- stable/7/sys/dev/drm/drmP.h Mon Jul 27 16:03:04 2009(r195911)
+++ stable/7/sys/dev/drm/drmP.h Mon Jul 27 16:05:51 2009(r195912)
@@ -502,19 +502,10 @@ typedef struct drm_local_map {
TAILQ_ENTRY(drm_local_map) link;
 } drm_local_map_t;
 
-TAILQ_HEAD(drm_vbl_sig_list, drm_vbl_sig);
-typedef struct drm_vbl_sig {
-   TAILQ_ENTRY(drm_vbl_sig) link;
-   unsigned intsequence;
-   int signo;
-   int pid;
-} drm_vbl_sig_t;
-
 struct drm_vblank_info {
wait_queue_head_t queue;/* vblank wait queue */
atomic_t count; /* number of VBLANK interrupts */
/* (driver must alloc the right number 
of counters) */
-   struct drm_vbl_sig_list sigs;   /* signal list to send on VBLANK */
atomic_t refcount;  /* number of users of vblank interrupts 
*/
u32 last;   /* protected by dev->vbl_lock, used */
/* for wraparound handling */
@@ -684,7 +675,6 @@ struct drm_device {
int   last_context; /* Last current context*/
 
int   vblank_disable_allowed;
-   atomic_t  vbl_signal_pending;   /* number of signals pending on 
all crtcs */
struct calloutvblank_disable_timer;
u32   max_vblank_count; /* size of vblank counter 
register */
struct drm_vblank_info *vblank; /* per crtc vblank info */
@@ -802,7 +792,6 @@ voiddrm_vblank_put(struct drm_device *d
 void   drm_vblank_cleanup(struct drm_device *dev);
 intdrm_vblank_wait(struct drm_device *dev, unsigned int *vbl_seq);
 intdrm_vblank_init(struct drm_device *dev, int num_crtcs);
-void   drm_vbl_send_signals(struct drm_device *dev, int crtc);
 intdrm_modeset_ctl(struct drm_device *dev, void *data,
struct drm_file *file_priv);
 

Modified: stable/7/sys/dev/drm/drm_drv.c
==
--- stable/7/sys/dev/drm/drm_drv.c  Mon Jul 27 16:03:04 2009
(r195911)
+++ stable/7/sys/dev/drm/drm_drv.c  Mon Jul 27 16:05:51 2009
(r195912)
@@ -273,11 +273,14 @@ int drm_detach(device_t kdev)
 
drm_unload(dev);
 
-   bus_release_resource(dev->device, SYS_RES_IRQ, dev->irqrid, dev->irqr);
-
-   if (dev->msi_enabled) {
-   pci_release_msi(dev->device);
-   DRM_INFO("MSI released\n");
+   if (dev->irqr) {
+   bus_release_resource(dev->device, SYS_RES_IRQ, dev->irqrid,
+   dev->irqr);
+
+   if (dev->msi_enabled) {
+   pci_release_msi(dev->device);
+   DRM_INFO("MSI released\n");
+   }
}
 
return 0;

Modified: stable/7/sys/dev/drm/drm_irq.c
==
--- stable/7/sys/dev/drm/drm_irq.c  Mon Jul 27 16:03:04 2009
(r195911)
+++ stable/7/sys/dev/drm/drm_irq.c  Mon Jul 27 16:05:51 2009
(r195912)
@@ -70,6 +70,9 @@ static void vblank_disable_fn(void *arg)
struct drm_device *dev = (struct drm_device *)arg;
int i;
 
+   /* Make sure that we are called with the lock held */
+   mtx_assert(&dev->vbl_lock, MA_OWNED);
+
if (callout_pending(&dev->vblank_disable_timer)) {
/* callout was reset */
return;
@@ -86,7 +89,7 @@ static void vblank_disable_fn(void *arg)
return;
 
for (i = 0; i < dev->num_crtcs; i++) {
-   if (atomic_read(&dev->vblank[i].refcount) == 0 &&
+   if (dev->vblank[i].refcount == 0 &&
dev->vblank[i].enabled && !dev->vblank[i].inmodeset) {
DRM_DEBUG("disabling vblank on crtc %d\n", i);
dev->vblank[i].last =
@@ -109,7 +112,9 @@ void drm_vblank_cleanup(struct drm_devic
 
callout_drain(&dev->vblank_disable_timer);
 
+   DRM_SPINLOCK(&dev->vbl_lock);
vblank_disable_fn((void *)dev);
+   

svn commit: r195911 - head/sys/compat/freebsd32

2009-07-27 Thread John Baldwin
Author: jhb
Date: Mon Jul 27 16:03:04 2009
New Revision: 195911
URL: http://svn.freebsd.org/changeset/base/195911

Log:
  Fix the freebsd32 versions of semsys(), shmsys(), and msgsys() to use the
  old ABI versions of the relevant control system call (e.g.
  freebsd7_freebsd32_msgctl() instead of freebsd32_msgctl() for msgsys()).
  
  Approved by:  re (kib)

Modified:
  head/sys/compat/freebsd32/freebsd32_misc.c

Modified: head/sys/compat/freebsd32/freebsd32_misc.c
==
--- head/sys/compat/freebsd32/freebsd32_misc.c  Mon Jul 27 15:32:18 2009
(r195910)
+++ head/sys/compat/freebsd32/freebsd32_misc.c  Mon Jul 27 16:03:04 2009
(r195911)
@@ -1416,8 +1416,8 @@ freebsd32_semsys(struct thread *td, stru
 defined(COMPAT_FREEBSD6) || defined(COMPAT_FREEBSD7)
switch (uap->which) {
case 0:
-   return (freebsd32_semctl(td,
-   (struct freebsd32_semctl_args *)&uap->a2));
+   return (freebsd7_freebsd32_semctl(td,
+   (struct freebsd7_freebsd32_semctl_args *)&uap->a2));
default:
return (semsys(td, (struct semsys_args *)uap));
}
@@ -1580,8 +1580,8 @@ freebsd32_msgsys(struct thread *td, stru
 defined(COMPAT_FREEBSD6) || defined(COMPAT_FREEBSD7)
switch (uap->which) {
case 0:
-   return (freebsd32_msgctl(td,
-   (struct freebsd32_msgctl_args *)&uap->a2));
+   return (freebsd7_freebsd32_msgctl(td,
+   (struct freebsd7_freebsd32_msgctl_args *)&uap->a2));
case 2:
return (freebsd32_msgsnd(td,
(struct freebsd32_msgsnd_args *)&uap->a2));
@@ -1751,12 +1751,12 @@ freebsd32_shmsys(struct thread *td, stru
return (sysent[SYS_shmget].sy_call(td, &ap));
}
case 4: {   /* shmctl */
-   struct freebsd32_shmctl_args ap;
+   struct freebsd7_freebsd32_shmctl_args ap;
 
ap.shmid = uap->a2;
ap.cmd = uap->a3;
ap.buf = PTRIN(uap->a4);
-   return (freebsd32_shmctl(td, &ap));
+   return (freebsd7_freebsd32_shmctl(td, &ap));
}
case 1: /* oshmctl */
default:
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"


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

2009-07-27 Thread Pawel Jakub Dawidek
Author: pjd
Date: Mon Jul 27 14:52:34 2009
New Revision: 195909
URL: http://svn.freebsd.org/changeset/base/195909

Log:
  We don't support ephemeral IDs in FreeBSD and without this fix ZFS can
  panic when in zfs_fuid_create_cred() when userid is negative. It is
  converted to unsigned value which makes IS_EPHEMERAL() macro to
  incorrectly report that this is ephemeral ID. The most reasonable
  solution for now is to always report that the given ID is not ephemeral.
  
  PR:   kern/132337
  Submitted by: Matthew West 
  Tested by:Thomas Backman , Michael Reifenberger 

  Approved by:  re (kib)
  MFC after:2 weeks

Modified:
  head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h

Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h
==
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h Mon Jul 
27 14:22:09 2009(r195908)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h Mon Jul 
27 14:52:34 2009(r195909)
@@ -78,7 +78,11 @@ extern "C" {
 /*
  * Is ID ephemeral?
  */
+#ifdef TODO
 #defineIS_EPHEMERAL(x) (x > MAXUID)
+#else
+#defineIS_EPHEMERAL(x) (0)
+#endif
 
 /*
  * Should we use FUIDs?
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"


Re: svn commit: r195907 - in head/sys: amd64/amd64 i386/i386

2009-07-27 Thread Thomas Backman

On Jul 27, 2009, at 16:23, Rui Paulo wrote:


On 27 Jul 2009, at 15:04, Thomas Backman wrote:


On Jul 27, 2009, at 15:51, Rui Paulo wrote:

Author: rpaulo
Date: Mon Jul 27 13:51:55 2009
New Revision: 195907
URL: http://svn.freebsd.org/changeset/base/195907

Log:
Refine the MacBook hack to only match early models that have Intel  
ICH.

Hmm, My MacBookPro2,2 has an ICH7M chipset. Does that count? :-)


Depends. Does this change break booting FreeBSD on your macbook pro?  
If so, I'll add it to the list.
To be short and honest: no clue. I just wondered, since the commit  
message mentioned "early models that have Intel ICH", and the models  
added aren't the only ones with Intel ICH-family chipsets.

(I don't run FreeBSD on this computer, except in VMware.)

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


Re: svn commit: r195907 - in head/sys: amd64/amd64 i386/i386

2009-07-27 Thread Rui Paulo


On 27 Jul 2009, at 15:04, Thomas Backman wrote:


On Jul 27, 2009, at 15:51, Rui Paulo wrote:

Author: rpaulo
Date: Mon Jul 27 13:51:55 2009
New Revision: 195907
URL: http://svn.freebsd.org/changeset/base/195907

Log:
Refine the MacBook hack to only match early models that have Intel  
ICH.

Hmm, My MacBookPro2,2 has an ICH7M chipset. Does that count? :-)


Depends. Does this change break booting FreeBSD on your macbook pro?  
If so, I'll add it to the list.

--
Rui Paulo

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


svn commit: r195908 - in head: sbin/ifconfig sys/net80211

2009-07-27 Thread Rui Paulo
Author: rpaulo
Date: Mon Jul 27 14:22:09 2009
New Revision: 195908
URL: http://svn.freebsd.org/changeset/base/195908

Log:
  Mesh fixes, namely:
  * don't clobber proxy entries
  * HWMP seq number processing, including discard of old frames
  * flush routing table entries based on nexthop
  * print route flags in ifconfig
  * more debugging messages and comments
  
  Proxy changes submitted by sam.
  
  Approved by:  re (kib)

Modified:
  head/sbin/ifconfig/ifieee80211.c
  head/sys/net80211/ieee80211_hwmp.c
  head/sys/net80211/ieee80211_ioctl.h
  head/sys/net80211/ieee80211_mesh.c
  head/sys/net80211/ieee80211_mesh.h

Modified: head/sbin/ifconfig/ifieee80211.c
==
--- head/sbin/ifconfig/ifieee80211.cMon Jul 27 13:51:55 2009
(r195907)
+++ head/sbin/ifconfig/ifieee80211.cMon Jul 27 14:22:09 2009
(r195908)
@@ -3952,9 +3952,9 @@ list_regdomain(int s, int channelsalso)
 static void
 list_mesh(int s)
 {
-   int i;
struct ieee80211req ireq;
struct ieee80211req_mesh_route routes[128];
+   struct ieee80211req_mesh_route *rt;
 
(void) memset(&ireq, 0, sizeof(ireq));
(void) strncpy(ireq.i_name, name, sizeof(ireq.i_name));
@@ -3965,23 +3965,26 @@ list_mesh(int s)
if (ioctl(s, SIOCG80211, &ireq) < 0)
err(1, "unable to get the Mesh routing table");
 
-   printf("%-17.17s %-17.17s %4s %4s %4s %6s\n"
+   printf("%-17.17s %-17.17s %4s %4s %4s %6s %s\n"
, "DEST"
, "NEXT HOP"
, "HOPS"
, "METRIC"
, "LIFETIME"
-   , "MSEQ");
+   , "MSEQ"
+   , "FLAGS");
 
-   for (i = 0; i < ireq.i_len / sizeof(*routes); i++) {
+   for (rt = &routes[0]; rt - &routes[0] < ireq.i_len / sizeof(*rt); rt++){
printf("%s ",
-   ether_ntoa((const struct ether_addr *)routes[i].imr_dest));
-   printf("%s %4u   %4u   %6u %6u\n",
-   ether_ntoa((const struct ether_addr *)
-   routes[i].imr_nexthop),
-   routes[i].imr_nhops, routes[i].imr_metric,
-   routes[i].imr_lifetime,
-   routes[i].imr_lastmseq);
+   ether_ntoa((const struct ether_addr *)rt->imr_dest));
+   printf("%s %4u   %4u   %6u %6u%c%c\n",
+   ether_ntoa((const struct ether_addr *)rt->imr_nexthop),
+   rt->imr_nhops, rt->imr_metric, rt->imr_lifetime,
+   rt->imr_lastmseq,
+   (rt->imr_flags & IEEE80211_MESHRT_FLAGS_VALID) ?
+   'V' : '!',
+   (rt->imr_flags & IEEE80211_MESHRT_FLAGS_PROXY) ?
+   'P' : ' ');
}
 }
 

Modified: head/sys/net80211/ieee80211_hwmp.c
==
--- head/sys/net80211/ieee80211_hwmp.c  Mon Jul 27 13:51:55 2009
(r195907)
+++ head/sys/net80211/ieee80211_hwmp.c  Mon Jul 27 14:22:09 2009
(r195908)
@@ -137,15 +137,18 @@ static const uint8_t  broadcastaddr[IEEE8
{ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
 
 typedef uint32_t ieee80211_hwmp_seq;
-#defineIEEE80211_HWMP_SEQ_LEQ(a, b)((int32_t)((a)-(b)) <= 0)
-#defineIEEE80211_HWMP_SEQ_GEQ(a, b)((int32_t)((a)-(b)) >= 0)
+#defineHWMP_SEQ_LT(a, b)   ((int32_t)((a)-(b)) < 0)
+#defineHWMP_SEQ_LEQ(a, b)  ((int32_t)((a)-(b)) <= 0)
+#defineHWMP_SEQ_GT(a, b)   ((int32_t)((a)-(b)) > 0)
+#defineHWMP_SEQ_GEQ(a, b)  ((int32_t)((a)-(b)) >= 0)
 
 /*
  * Private extension of ieee80211_mesh_route.
  */
 struct ieee80211_hwmp_route {
-   ieee80211_hwmp_seq  hr_seq; /* HWMP sequence number */
-   ieee80211_hwmp_seq  hr_preqid;  /* Last PREQ ID seen */
+   ieee80211_hwmp_seq  hr_seq; /* last HWMP seq seen from dst*/
+   ieee80211_hwmp_seq  hr_preqid;  /* last PREQ ID seen from dst */
+   ieee80211_hwmp_seq  hr_targetseq;   /* seq. no. on our latest PREQ*/
int hr_preqretries;
 };
 struct ieee80211_hwmp_state {
@@ -274,7 +277,6 @@ hwmp_newstate(struct ieee80211vap *vap, 
__func__, ieee80211_state_name[ostate],
ieee80211_state_name[nstate], arg);
 
-   /* Flush the table on RUN -> !RUN, e.g. interface down & up */
if (nstate != IEEE80211_S_RUN && ostate == IEEE80211_S_RUN)
callout_drain(&hs->hs_roottimer);
if (nstate == IEEE80211_S_RUN)
@@ -656,8 +658,9 @@ hwmp_rootmode_cb(void *arg)
IEEE80211_NOTE(vap, IEEE80211_MSG_HWMP, vap->iv_bss,
"%s", "send broadcast PREQ");
 
-   /* XXX check portal role */
preq.preq_flags = IEEE80211_MESHPREQ_FLAGS_AM;
+   if (ms->ms_flags & IEEE80211_MESHFLAGS_PO

Re: svn commit: r195817 - head/usr.sbin/sysinstall

2009-07-27 Thread Nathan Whitehorn

John Baldwin wrote:

[snipped]

Ah, we will never be freed of the CHS bonds, will we.  Oh well.



GPT doesn't use C/H/S and thus doesn't have the weird limitations of the MBR + 
BSD label arrangement.  As soon as sysinstall can install to a GPT-labelled 
disk you will be free of the bonds in sysinstall.  I think the easiest way to 
allow for that w/o dealing with the headaches of fdisk.c and label.c and 
libgeom support in sysinstall, etc., etc. is to add a sort of "cheat" mode to 
sysinstall where you can say "look, I've already partitioned my drives and 
newfs'd my filesystems and they are mounted at '/foo', go install all the 
bits into there".  We could then let people setup their disks using command 
line tools with the livefs or what is in the install rescue build using GPT 
or ZFS or gmirror, etc.  Getting /etc/fstab correct in that instance becomes 
a bit more tricky, but not impossible.  (If nothing else one could take the 
output of mount -p, find all the paths starting with /foo, chop off the 
leading /foo, and write that out as an initial /etc/fstab.)  That would at 
least allow people to do more creative things with disks with sysinstall 
until the disk labeller can be overhauled.


  
This would be extremely useful also on PowerPC, and probably some 
embedded systems as well (though I doubt they are using sysinstall). 
sysinstall currently cannot write APM partitions, so we don't currently 
ship a functional installer on PPC. However, gpart can write APM 
partitions, and so this even this stopgap would be the difference 
between an installable 8.0-RELEASE on PowerPC and an uninstallable one 
for many users.

-Nathan

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


Re: svn commit: r195907 - in head/sys: amd64/amd64 i386/i386

2009-07-27 Thread Thomas Backman

On Jul 27, 2009, at 15:51, Rui Paulo wrote:

Author: rpaulo
Date: Mon Jul 27 13:51:55 2009
New Revision: 195907
URL: http://svn.freebsd.org/changeset/base/195907

Log:
 Refine the MacBook hack to only match early models that have Intel  
ICH.

Hmm, My MacBookPro2,2 has an ICH7M chipset. Does that count? :-)

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


svn commit: r195907 - in head/sys: amd64/amd64 i386/i386

2009-07-27 Thread Rui Paulo
Author: rpaulo
Date: Mon Jul 27 13:51:55 2009
New Revision: 195907
URL: http://svn.freebsd.org/changeset/base/195907

Log:
  Refine the MacBook hack to only match early models that have Intel ICH.
  
  Discussed with:   kjim
  Approved by:  re (kib)

Modified:
  head/sys/amd64/amd64/machdep.c
  head/sys/i386/i386/machdep.c

Modified: head/sys/amd64/amd64/machdep.c
==
--- head/sys/amd64/amd64/machdep.c  Mon Jul 27 13:41:45 2009
(r195906)
+++ head/sys/amd64/amd64/machdep.c  Mon Jul 27 13:51:55 2009
(r195907)
@@ -213,7 +213,10 @@ cpu_startup(dummy)
 */
sysenv = getenv("smbios.system.product");
if (sysenv != NULL) {
-   if (strncmp(sysenv, "MacBook", 7) == 0) {
+   if (strncmp(sysenv, "MacBook1,1", 10) == 0 ||
+   strncmp(sysenv, "MacBookPro1,1", 13) == 0 ||
+   strncmp(sysenv, "MacBookPro1,2", 13) == 0 ||
+   strncmp(sysenv, "Macmini1,1", 10) == 0) {
if (bootverbose)
printf("Disabling LEGACY_USB_EN bit on "
"Intel ICH.\n");

Modified: head/sys/i386/i386/machdep.c
==
--- head/sys/i386/i386/machdep.cMon Jul 27 13:41:45 2009
(r195906)
+++ head/sys/i386/i386/machdep.cMon Jul 27 13:51:55 2009
(r195907)
@@ -257,7 +257,10 @@ cpu_startup(dummy)
 */
sysenv = getenv("smbios.system.product");
if (sysenv != NULL) {
-   if (strncmp(sysenv, "MacBook", 7) == 0) {
+   if (strncmp(sysenv, "MacBook1,1", 10) == 0 ||
+   strncmp(sysenv, "MacBookPro1,1", 13) == 0 ||
+   strncmp(sysenv, "MacBookPro1,2", 13) == 0 ||
+   strncmp(sysenv, "Macmini1,1", 10) == 0) {
if (bootverbose)
printf("Disabling LEGACY_USB_EN bit on "
"Intel ICH.\n");
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"


svn commit: r195906 - head/sys/netinet

2009-07-27 Thread Michael Tuexen
Author: tuexen
Date: Mon Jul 27 13:41:45 2009
New Revision: 195906
URL: http://svn.freebsd.org/changeset/base/195906

Log:
  Fix the handling of unordered messages when using
  PR-SCTP.
  
  Approved by: re, rrs (mentor)
  MFC after: 3 weeks.

Modified:
  head/sys/netinet/sctp_indata.c

Modified: head/sys/netinet/sctp_indata.c
==
--- head/sys/netinet/sctp_indata.c  Mon Jul 27 13:36:35 2009
(r195905)
+++ head/sys/netinet/sctp_indata.c  Mon Jul 27 13:41:45 2009
(r195906)
@@ -5923,7 +5923,13 @@ sctp_flush_reassm_for_str_seq(struct sct
chk = TAILQ_FIRST(&asoc->reasmqueue);
while (chk) {
at = TAILQ_NEXT(chk, sctp_next);
-   if (chk->rec.data.stream_number != stream) {
+   /*
+* Do not toss it if on a different stream or marked
+* for unordered delivery in which case the stream
+* sequence number has no meaning.
+*/
+   if ((chk->rec.data.stream_number != stream) ||
+   ((chk->rec.data.rcv_flags & SCTP_DATA_UNORDERED) == 
SCTP_DATA_UNORDERED)) {
chk = at;
continue;
}
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"


svn commit: r195905 - head/share/man/man4

2009-07-27 Thread Rui Paulo
Author: rpaulo
Date: Mon Jul 27 13:36:35 2009
New Revision: 195905
URL: http://svn.freebsd.org/changeset/base/195905

Log:
  * Document the dev.asmc.N.light.control sysctl. [1]
  * Add more models that have the SMC.
  
  PR:   137168 [1]
  Submitted by: Patrick Lamaiziere 
  Approved by:  re (kib)

Modified:
  head/share/man/man4/asmc.4

Modified: head/share/man/man4/asmc.4
==
--- head/share/man/man4/asmc.4  Mon Jul 27 12:09:32 2009(r195904)
+++ head/share/man/man4/asmc.4  Mon Jul 27 13:36:35 2009(r195905)
@@ -1,5 +1,5 @@
 .\"-
-.\" Copyright (c) 2007, 2008 Rui Paulo 
+.\" Copyright (c) 2007, 2008, 2009 Rui Paulo 
 .\" All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
@@ -25,7 +25,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd April 7, 2008
+.Dd July 27, 2009
 .Dt ASMC 4
 .Os
 .Sh NAME
@@ -54,11 +54,17 @@ The SMC is known to be found on the foll
 .Pp
 .Bl -bullet -offset indent -compact
 .It
-MacBook (any generation)
+MacBook
 .It
-MacBook Pro (any generation)
+MacBook Pro
 .It
 Intel MacMini
+.It
+Mac Pro
+.It
+MacBook Air
+.It
+Intel iMac
 .El
 .Pp
 With this driver, you can configure your keyboard backlight
@@ -72,15 +78,16 @@ under the device tree
 .Sh KEYBOARD BACKLIGHT
 On
 .Tn MacBook Pro
-systems, you can control the keyboard brightness by writing values to
+systems, you can control the keyboard brightness by writing a value to
 the
+.Va dev.asmc.%d.light.control
+sysctl MIB.
+.Pp
+The following sysctl MIBs contains the raw value returned by the left
+and right light sensors:
 .Va dev.asmc.%d.light.left
 or
-.Va dev.asmc.%d.light.right
-sysctl MIBs.
-.Pp
-Each of these sysctl MIBs contains the raw value returned by the left
-and right light sensors.
+.Va dev.asmc.%d.light.right .
 .Sh TEMPERATURES
 The number of temperature sensors and their description varies among
 systems.
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"


Re: svn commit: r195817 - head/usr.sbin/sysinstall

2009-07-27 Thread John Baldwin
On Saturday 25 July 2009 12:09:00 am Scott Long wrote:
> M. Warner Losh wrote:
> > In message: <4a6a7f2d.90...@samsco.org>
> > Scott Long  writes:
> > : M. Warner Losh wrote:
> > : > In message: <4a68da56.60...@samsco.org>
> > : > Scott Long  writes:
> > : > : M. Warner Losh wrote:
> > : > : > In message: <4a66d0f4.4030...@freebsd.org>
> > : > : > Alexander Motin  writes:
> > : > : > : Colin Percival wrote:
> > : > : > : > Author: cperciva
> > : > : > : > Date: Wed Jul 22 03:50:54 2009
> > : > : > : > New Revision: 195817
> > : > : > : > URL: http://svn.freebsd.org/changeset/base/195817
> > : > : > : > 
> > : > : > : > Log:
> > : > : > : >   Remove the "dedicated disk mode" partitioning option from 
sysinstall, in
> > : > : > : >   both the disk partitioning screen (the 'F' key) and via 
install.cfg (the
> > : > : > : >   VAR_DEDICATED_DISK option).  This functionality is currently 
broken in 8.x
> > : > : > : >   due to libdisk and geom generating different partition 
names; this commit
> > : > : > : >   merely acts to help steer users away from the breakage.
> > : > : > : >   
> > : > : > : >   Submitted by: randi
> > : > : > : >   Approved by:  re (kensmith)
> > : > : > : > 
> > : > : > : > Modified:
> > : > : > : >   head/usr.sbin/sysinstall/disks.c
> > : > : > : 
> > : > : > : Is there any other way to not align FS block to the ugly legacy 
63
> > : > : > : sectors per track boundary with sysinstall now? I think RAIDs 
won't be
> > : > : > : happy. May be it would be better to fix it?
> > : > : > 
> > : > : > The reason we do it like this is because the boot blocks occupy 
the
> > : > : > first cylinder group.  Which with today's fake goemetry is 63
> > : > : > blocks...
> > : > : > 
> > : > : 
> > : > : I already covered this.  Unfortunately, Randi didn't take my bait. 
> > : > : Anyways, '63' is a minimum, it's not a singular value.  It's also
> > : > : an incredibly bad default.
> > : > 
> > : > Yes.  256 is just as good as 63, unless the geometry reports more than
> > : > 256 heads, which I don't think is possible...
> > : > 
> > : > Warner
> > : 
> > : If there is a BIOS in existence that can't find sector 256, then it 
> > : likely can't boot off of anything other than partition 1 in the fdisk
> > : table.  I bet that bugs like that were likely caught 15-20 years ago.
> > 
> > I think you were missing the point I was trying to make, I must have
> > been unclear.
> > 
> > If there were more than 256 sectors in the first cylinder, then
> > starting at 256 would overlap.  This is largely a theoretical
> > problem, I think, since I don't think that the BIOS can report a
> > geometry > 64.
> > 
> > The only issue that I can think of is that FreeBSD's fdisk wants to
> > have things on cylinder boundaries, which 256 isn't, so fdisk will
> > bitch and moan...
> > 
> > Warner
> 
> Ah, we will never be freed of the CHS bonds, will we.  Oh well.

GPT doesn't use C/H/S and thus doesn't have the weird limitations of the MBR + 
BSD label arrangement.  As soon as sysinstall can install to a GPT-labelled 
disk you will be free of the bonds in sysinstall.  I think the easiest way to 
allow for that w/o dealing with the headaches of fdisk.c and label.c and 
libgeom support in sysinstall, etc., etc. is to add a sort of "cheat" mode to 
sysinstall where you can say "look, I've already partitioned my drives and 
newfs'd my filesystems and they are mounted at '/foo', go install all the 
bits into there".  We could then let people setup their disks using command 
line tools with the livefs or what is in the install rescue build using GPT 
or ZFS or gmirror, etc.  Getting /etc/fstab correct in that instance becomes 
a bit more tricky, but not impossible.  (If nothing else one could take the 
output of mount -p, find all the paths starting with /foo, chop off the 
leading /foo, and write that out as an initial /etc/fstab.)  That would at 
least allow people to do more creative things with disks with sysinstall 
until the disk labeller can be overhauled.

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


svn commit: r195904 - head/sys/netinet

2009-07-27 Thread Michael Tuexen
Author: tuexen
Date: Mon Jul 27 12:09:32 2009
New Revision: 195904
URL: http://svn.freebsd.org/changeset/base/195904

Log:
  Get rid of unused field. This will also be deleted
  in the official speciication of the SCTP socket API.
  
  Approved by:re, rrs (mentor)

Modified:
  head/sys/netinet/sctp_uio.h

Modified: head/sys/netinet/sctp_uio.h
==
--- head/sys/netinet/sctp_uio.h Mon Jul 27 07:07:56 2009(r195903)
+++ head/sys/netinet/sctp_uio.h Mon Jul 27 12:09:32 2009(r195904)
@@ -95,7 +95,6 @@ struct sctp_sndrcvinfo {
uint16_t sinfo_stream;
uint16_t sinfo_ssn;
uint16_t sinfo_flags;
-   uint16_t sinfo_pr_policy;
uint32_t sinfo_ppid;
uint32_t sinfo_context;
uint32_t sinfo_timetolive;
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"


svn commit: r195903 - vendor/less/v436

2009-07-27 Thread Xin LI
Author: delphij
Date: Mon Jul 27 07:07:56 2009
New Revision: 195903
URL: http://svn.freebsd.org/changeset/base/195903

Log:
  Tag for less v436.

Added:
  vendor/less/v436/
 - copied from r195902, vendor/less/dist/
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"


svn commit: r195902 - vendor/less/dist

2009-07-27 Thread Xin LI
Author: delphij
Date: Mon Jul 27 07:05:08 2009
New Revision: 195902
URL: http://svn.freebsd.org/changeset/base/195902

Log:
  Vendor import of less v436.

Added:
  vendor/less/dist/cvt.c
  vendor/less/dist/pattern.c
  vendor/less/dist/pattern.h
Modified:
  vendor/less/dist/LICENSE
  vendor/less/dist/Makefile.aut
  vendor/less/dist/Makefile.dsb
  vendor/less/dist/Makefile.dsg
  vendor/less/dist/Makefile.dsu
  vendor/less/dist/Makefile.in
  vendor/less/dist/Makefile.o2e
  vendor/less/dist/Makefile.o9c
  vendor/less/dist/Makefile.o9u
  vendor/less/dist/Makefile.wnb
  vendor/less/dist/Makefile.wnm
  vendor/less/dist/NEWS
  vendor/less/dist/README
  vendor/less/dist/brac.c
  vendor/less/dist/ch.c
  vendor/less/dist/charset.c
  vendor/less/dist/charset.h
  vendor/less/dist/cmd.h
  vendor/less/dist/cmdbuf.c
  vendor/less/dist/command.c
  vendor/less/dist/configure.ac
  vendor/less/dist/decode.c
  vendor/less/dist/defines.ds
  vendor/less/dist/defines.o2
  vendor/less/dist/defines.o9
  vendor/less/dist/defines.wn
  vendor/less/dist/edit.c
  vendor/less/dist/filename.c
  vendor/less/dist/forwback.c
  vendor/less/dist/funcs.h
  vendor/less/dist/ifile.c
  vendor/less/dist/input.c
  vendor/less/dist/jump.c
  vendor/less/dist/less.h
  vendor/less/dist/less.man
  vendor/less/dist/less.nro
  vendor/less/dist/lessecho.c
  vendor/less/dist/lessecho.man
  vendor/less/dist/lessecho.nro
  vendor/less/dist/lesskey.c
  vendor/less/dist/lesskey.h
  vendor/less/dist/lesskey.man
  vendor/less/dist/lesskey.nro
  vendor/less/dist/lglob.h
  vendor/less/dist/line.c
  vendor/less/dist/linenum.c
  vendor/less/dist/lsystem.c
  vendor/less/dist/main.c
  vendor/less/dist/mark.c
  vendor/less/dist/mkhelp.c
  vendor/less/dist/optfunc.c
  vendor/less/dist/option.c
  vendor/less/dist/option.h
  vendor/less/dist/opttbl.c
  vendor/less/dist/os.c
  vendor/less/dist/output.c
  vendor/less/dist/pckeys.h
  vendor/less/dist/position.c
  vendor/less/dist/position.h
  vendor/less/dist/prompt.c
  vendor/less/dist/screen.c
  vendor/less/dist/scrsize.c
  vendor/less/dist/search.c
  vendor/less/dist/signal.c
  vendor/less/dist/tags.c
  vendor/less/dist/ttyin.c
  vendor/less/dist/version.c

Modified: vendor/less/dist/LICENSE
==
--- vendor/less/dist/LICENSEMon Jul 27 04:41:04 2009(r195901)
+++ vendor/less/dist/LICENSEMon Jul 27 07:05:08 2009(r195902)
@@ -2,7 +2,7 @@
   
 
 Less
-Copyright (C) 1984-2008  Mark Nudelman
+Copyright (C) 1984-2009  Mark Nudelman
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions

Modified: vendor/less/dist/Makefile.aut
==
--- vendor/less/dist/Makefile.aut   Mon Jul 27 04:41:04 2009
(r195901)
+++ vendor/less/dist/Makefile.aut   Mon Jul 27 07:05:08 2009
(r195902)
@@ -10,10 +10,10 @@ srcdir = .
 
 SRC = \
main.c screen.c brac.c ch.c charset.c cmdbuf.c \
-   command.c decode.c edit.c filename.c forwback.c \
+   command.c cvt.c decode.c edit.c filename.c forwback.c \
help.c ifile.c input.c jump.c line.c linenum.c \
lsystem.c mark.c optfunc.c option.c opttbl.c os.c \
-   output.c position.c prompt.c search.c signal.c \
+   output.c pattern.c position.c prompt.c search.c signal.c \
tags.c ttyin.c version.c  
 DISTFILES_W = \
defines.ds  Makefile.dsb Makefile.dsg Makefile.dsu \
@@ -24,7 +24,8 @@ DISTFILES = \
${SRC} regexp.c regexp.h \
COPYING INSTALL LICENSE Makefile.in Makefile.aut NEWS README \
configure configure.ac lesskey.c lessecho.c scrsize.c \
-   charset.h cmd.h funcs.h lglob.h less.h lesskey.h option.h pckeys.h 
position.h \
+   charset.h cmd.h funcs.h lglob.h less.h lesskey.h option.h \
+   pckeys.h pattern.h position.h \
install.sh defines.h.in mkinstalldirs \
less.nro less.man lesskey.nro lesskey.man lessecho.nro lessecho.man \
less.hlp \
@@ -109,6 +110,8 @@ dist: ${DISTFILES}
cd $$REL; chmod +w ${DISTFILES_W}; cd ..; \
echo "Creating release/$$REL/$$REL.tar.gz"; \
tar -cf - $$REL | gzip -c >release/$$REL/$$REL.tar.gz; \
+   echo "Signing release/$$REL/$$REL.tar.gz"; \
+   gpg --detach-sign release/$$REL/$$REL.tar.gz; \
echo "Creating release/$$REL/$$REL.zip"; \
zip -rq release/$$REL/$$REL.zip $$REL; \
rm -rf $$REL

Modified: vendor/less/dist/Makefile.dsb
==
--- vendor/less/dist/Makefile.dsb   Mon Jul 27 04:41:04 2009
(r195901)
+++ vendor/less/dist/Makefile.dsb   Mon Jul 27 07:05:08 2009
(r195902)
@@ -18,12 +18,13 @@ EXT = .EXE
 .c.obj:
$(CC) -c -I. $(CPPFLAGS) $(CFLAGS) $<
 
-OBJ =  main.obj screen.obj brac.obj ch.obj charset.obj cm