Revision da241efcd9c3da2af6ba20055c7e158ec725005c authored by Linus Torvalds on 03 April 2013, 01:58:01 UTC, committed by Linus Torvalds on 03 April 2013, 01:58:01 UTC
Pull networking fixes from David Miller: 1) Fix VSOCK layer handling of context ID changes, from Reilly Grant. 2) Now that we have a synchronize_net() in netdev_rx_handler_unregister(), we can't let any call sites hold locks. Unfortunately bonding does, so we have to drop the rwlock there a little bit earlier, fix from Veaceslav Falico. 3) MAC address setting loop exits one iteration too early in mlx4 driver, from Yan Burman. 4) Restore ipv6 routes properly upon ifdown/ifup of loopback, from Balakumaran Kannan. * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: VSOCK: Handle changes to the VMCI context ID. net IPv6 : Fix broken IPv6 routing table after loopback down-up cbq: incorrect processing of high limits net/mlx4_en: Fix setting initial MAC address bonding: get netdev_rx_handler_unregister out of locks
mixer_oss.h
#ifndef __SOUND_MIXER_OSS_H
#define __SOUND_MIXER_OSS_H
/*
* OSS MIXER API
* Copyright (c) by Jaroslav Kysela <perex@perex.cz>
*
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
*/
#if defined(CONFIG_SND_MIXER_OSS) || defined(CONFIG_SND_MIXER_OSS_MODULE)
#define SNDRV_OSS_MAX_MIXERS 32
struct snd_mixer_oss_file;
struct snd_mixer_oss_slot {
int number;
unsigned int stereo: 1;
int (*get_volume)(struct snd_mixer_oss_file *fmixer,
struct snd_mixer_oss_slot *chn,
int *left, int *right);
int (*put_volume)(struct snd_mixer_oss_file *fmixer,
struct snd_mixer_oss_slot *chn,
int left, int right);
int (*get_recsrc)(struct snd_mixer_oss_file *fmixer,
struct snd_mixer_oss_slot *chn,
int *active);
int (*put_recsrc)(struct snd_mixer_oss_file *fmixer,
struct snd_mixer_oss_slot *chn,
int active);
unsigned long private_value;
void *private_data;
void (*private_free)(struct snd_mixer_oss_slot *slot);
int volume[2];
};
struct snd_mixer_oss {
struct snd_card *card;
char id[16];
char name[32];
struct snd_mixer_oss_slot slots[SNDRV_OSS_MAX_MIXERS]; /* OSS mixer slots */
unsigned int mask_recsrc; /* exclusive recsrc mask */
int (*get_recsrc)(struct snd_mixer_oss_file *fmixer,
unsigned int *active_index);
int (*put_recsrc)(struct snd_mixer_oss_file *fmixer,
unsigned int active_index);
void *private_data_recsrc;
void (*private_free_recsrc)(struct snd_mixer_oss *mixer);
struct mutex reg_mutex;
struct snd_info_entry *proc_entry;
int oss_dev_alloc;
/* --- */
int oss_recsrc;
};
struct snd_mixer_oss_file {
struct snd_card *card;
struct snd_mixer_oss *mixer;
};
int snd_mixer_oss_ioctl_card(struct snd_card *card,
unsigned int cmd, unsigned long arg);
#endif /* CONFIG_SND_MIXER_OSS */
#endif /* __SOUND_MIXER_OSS_H */
![swh spinner](/static/img/swh-spinner.gif)
Computing file changes ...